| commit | d7c4d54d28b87c239af757e1ce9aefd71156504c | [log] [tgz] |
|---|---|---|
| author | Patti <[email protected]> | Thu Dec 07 00:54:14 2017 |
| committer | Commit Bot <[email protected]> | Thu Dec 07 00:54:14 2017 |
| tree | 6b7aa0903cc305facb815321a9d384583eb48856 | |
| parent | 9b2966b89ed478938ffdb6eb923e0b180c86f7e2 [diff] [blame] |
Page Info Desktop: Always show the Flash permission. Show the Flash permission always on desktop Page Info. Bug: 791142 Change-Id: I42dd4e856ce0818cea9905e36669a74cc54a6f98 Reviewed-on: https://chromium-review.googlesource.com/809987 Commit-Queue: Patti <[email protected]> Reviewed-by: Raymes Khoury <[email protected]> Cr-Commit-Position: refs/heads/master@{#522281}
diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc index 216301a..36818182 100644 --- a/chrome/browser/ui/page_info/page_info.cc +++ b/chrome/browser/ui/page_info/page_info.cc
@@ -181,6 +181,10 @@ // gets checked there regardless of default setting on Desktop. if (info.type == CONTENT_SETTINGS_TYPE_GEOLOCATION) return true; +#else + // Flash will always be shown. See https://crbug.com/791142. + if (info.type == CONTENT_SETTINGS_TYPE_PLUGINS) + return true; #endif #if !defined(OS_ANDROID)