|
Move click-to-play to about:flags.
XIB changes: Add an outlet |pluginDefaultSettingMatrix_| to ContentSettingsDialogController, hooked up to the associated matrix, to remove the click-to-play radio button.
While I'm at it, clean up a bit:
* Remove the old --disable-click-to-play flag that reverted to the M6 behavior for blocked plugins
* Make ContentExceptionsWindowController use ContentSettingComboModel for the action popup.
* Make HostContentSettingsMapTest use AutoReset to reset command line switches.
BUG= 62091
TEST=unit_tests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=65953
Total comments: 2
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+198 lines, -172 lines) |
Patch |
|
M |
chrome/app/generated_resources.grd
|
View
|
1
2
3
4
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/app/nibs/ContentSettings.xib
|
View
|
|
4 chunks |
+27 lines, -21 lines |
0 comments
|
Download
|
|
M |
chrome/browser/about_flags.cc
|
View
|
1
2
3
4
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/cocoa/content_exceptions_window_controller.h
|
View
|
|
2 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
|
M |
chrome/browser/cocoa/content_exceptions_window_controller.mm
|
View
|
|
8 chunks |
+11 lines, -63 lines |
0 comments
|
Download
|
|
M |
chrome/browser/cocoa/content_setting_bubble_cocoa.mm
|
View
|
|
1 chunk |
+11 lines, -26 lines |
0 comments
|
Download
|
|
M |
chrome/browser/cocoa/content_settings_dialog_controller.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/cocoa/content_settings_dialog_controller.mm
|
View
|
|
2 chunks |
+27 lines, -3 lines |
0 comments
|
Download
|
|
M |
chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm
|
View
|
3
|
4 chunks |
+23 lines, -7 lines |
0 comments
|
Download
|
|
M |
chrome/browser/content_setting_bubble_model.cc
|
View
|
|
1 chunk |
+2 lines, -7 lines |
0 comments
|
Download
|
|
M |
chrome/browser/content_setting_bubble_model_unittest.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/content_setting_combo_model.cc
|
View
|
|
2 chunks |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/gtk/options/content_filter_page_gtk.cc
|
View
|
1
2
3
|
1 chunk |
+9 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/host_content_settings_map.cc
|
View
|
4
5
6
7
|
5 chunks |
+28 lines, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/host_content_settings_map_unittest.cc
|
View
|
6
7
|
9 chunks |
+25 lines, -22 lines |
0 comments
|
Download
|
|
M |
chrome/browser/renderer_host/browser_render_process_host.cc
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/ui/views/options/content_filter_page_view.cc
|
View
|
|
1 chunk |
+8 lines, -4 lines |
0 comments
|
Download
|
|
M |
chrome/common/chrome_switches.h
|
View
|
1
2
3
4
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/common/chrome_switches.cc
|
View
|
1
2
3
4
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
chrome/renderer/render_view.cc
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -6 lines |
0 comments
|
Download
|
Total messages: 4 (0 generated)
|