|
|
Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugins
This replaces occurences of base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)
with PluginUtils::ShouldPreferHtmlOverPlugins which includes extra checks to
determine whether the feature should be enabled. PreferHtmlOverPlugins should
not be enabled if an enterprise setting is set because it currently doesn't
work correctly when the enterprise setting is set to ASK. The Profile has been
plumbed through to places where it's needed in order to make checking this
possible.
BUG= 654072
Review-Url: https://codereview.chromium.org/2408613002
Cr-Commit-Position: refs/heads/master@{#424583}
(cherry picked from commit b512db8bfb5266fb346540e24bca1416eb9260a7)
Committed: https://chromium.googlesource.com/chromium/src/+/9007bb1014ecfd5702041f3183397758edc9ed7b
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+243 lines, -117 lines) |
Patch |
 |
M |
chrome/browser/plugins/chrome_plugin_service_filter.cc
|
View
|
|
4 chunks |
+9 lines, -8 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/chrome_plugin_service_filter_unittest.cc
|
View
|
|
2 chunks |
+11 lines, -13 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/flash_download_interception.cc
|
View
|
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/flash_permission_context.cc
|
View
|
|
1 chunk |
+5 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/plugin_info_message_filter.cc
|
View
|
|
3 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/plugin_utils.h
|
View
|
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/plugin_utils.cc
|
View
|
|
3 chunks |
+21 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/plugins_field_trial.h
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/plugins/plugins_field_trial.cc
|
View
|
|
3 chunks |
+3 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
|
View
|
|
4 chunks |
+8 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/website_settings/permission_selector_button.h
|
View
|
|
2 chunks |
+6 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm
|
View
|
|
3 chunks |
+9 lines, -6 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm
|
View
|
|
3 chunks |
+11 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
|
View
|
|
2 chunks |
+10 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm
|
View
|
|
3 chunks |
+9 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
View
|
|
3 chunks |
+4 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/content_settings/content_setting_image_model.cc
|
View
|
|
2 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/website_settings/permission_prompt_impl.h
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
|
View
|
|
5 chunks |
+10 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/website_settings/permission_selector_row.h
|
View
|
|
3 chunks |
+6 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/website_settings/permission_selector_row.cc
|
View
|
|
5 chunks |
+10 lines, -11 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/website_settings/website_settings_popup_view.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
|
View
|
|
2 chunks |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/website_settings/permission_menu_model.h
|
View
|
|
3 chunks |
+9 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/website_settings/permission_menu_model.cc
|
View
|
|
7 chunks |
+20 lines, -8 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/website_settings/permission_menu_model_unittest.cc
|
View
|
|
4 chunks |
+29 lines, -19 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/website_settings/website_settings_ui.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/website_settings/website_settings_ui.cc
|
View
|
|
3 chunks |
+8 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/webui/options/content_settings_handler.cc
|
View
|
|
3 chunks |
+9 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
View
|
|
4 chunks |
+7 lines, -3 lines |
0 comments
|
Download
|
Total messages: 2 (1 generated)
|