diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 16:36:16 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 16:36:16 +0000 |
| commit | 3627b06dd62f0e4748ab57208eac7988c92932a2 (patch) | |
| tree | ea09e487e10a072b1ce2b16c55bf90dfcd466e94 /chrome/browser/content_setting_bubble_model_unittest.cc | |
| parent | 2500710027b1034c281b4ef99e0907d96759996b (diff) | |
| download | chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.zip chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.tar.gz chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.tar.bz2 | |
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
Review URL: http://codereview.chromium.org/4643007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_setting_bubble_model_unittest.cc')
| -rw-r--r-- | chrome/browser/content_setting_bubble_model_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/content_setting_bubble_model_unittest.cc b/chrome/browser/content_setting_bubble_model_unittest.cc index ac956b2..d9590e0 100644 --- a/chrome/browser/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/content_setting_bubble_model_unittest.cc @@ -109,6 +109,7 @@ TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) { CommandLine* cmd = CommandLine::ForCurrentProcess(); AutoReset<CommandLine> auto_reset(cmd, *cmd); cmd->AppendSwitch(switches::kEnableResourceContentSettings); + cmd->AppendSwitch(switches::kEnableClickToPlay); HostContentSettingsMap* map = profile_->GetHostContentSettingsMap(); std::string fooPlugin = "foo"; |