diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 08:07:46 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 08:07:46 +0000 |
| commit | a16a421b3959938bd40e9101b2bc86f4ad46e454 (patch) | |
| tree | d578fb60741ab29186bc6d24f69402f28782f678 /chrome/browser | |
| parent | d37d45ab0d5ef606b0f44d9591bfdb457d7de733 (diff) | |
| download | chromium_src-a16a421b3959938bd40e9101b2bc86f4ad46e454.zip chromium_src-a16a421b3959938bd40e9101b2bc86f4ad46e454.tar.gz chromium_src-a16a421b3959938bd40e9101b2bc86f4ad46e454.tar.bz2 | |
Enable click-to-play by default.
Click-to-play can be disabled using the --disable-click-to-play command line switch.
BUG=35316
TEST=none
Review URL: http://codereview.chromium.org/3250012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/cocoa/content_setting_bubble_cocoa.mm b/chrome/browser/cocoa/content_setting_bubble_cocoa.mm index 9d34f16..c3c8110 100644 --- a/chrome/browser/cocoa/content_setting_bubble_cocoa.mm +++ b/chrome/browser/cocoa/content_setting_bubble_cocoa.mm @@ -391,8 +391,8 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) { } - (void)sizeToFitLoadPluginsButton { - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableClickToPlay)) { + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableClickToPlay)) { const ContentSettingBubbleModel::BubbleContent& content = contentSettingBubbleModel_->bubble_content(); [loadAllPluginsButton_ setEnabled:content.load_plugins_link_enabled]; diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc index 7c9d1dc..ba36e4d 100644 --- a/chrome/browser/content_setting_bubble_model.cc +++ b/chrome/browser/content_setting_bubble_model.cc @@ -288,16 +288,16 @@ class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup { private: void SetLoadPluginsLinkTitle() { - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableClickToPlay)) { + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableClickToPlay)) { set_load_plugins_link_title( l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL)); } } virtual void OnLoadPluginsLinkClicked() { - DCHECK(CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableClickToPlay)); + DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableClickToPlay)); if (tab_contents()) { tab_contents()->render_view_host()->LoadBlockedPlugins(); } diff --git a/chrome/browser/content_setting_bubble_model_unittest.cc b/chrome/browser/content_setting_bubble_model_unittest.cc index d7c55ee..d114e89 100644 --- a/chrome/browser/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/content_setting_bubble_model_unittest.cc @@ -98,7 +98,7 @@ TEST_F(ContentSettingBubbleModelTest, Plugins) { EXPECT_NE(std::string(), bubble_content.manage_link); EXPECT_EQ(std::string(), bubble_content.info_link); EXPECT_NE(std::string(), bubble_content.title); - EXPECT_EQ(std::string(), bubble_content.load_plugins_link_title); + EXPECT_NE(std::string(), bubble_content.load_plugins_link_title); } TEST_F(ContentSettingBubbleModelTest, Geolocation) { diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 863362f..0a891a3 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -574,7 +574,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( switches::kBlockNonSandboxedPlugins, switches::kDisableOutdatedPlugins, switches::kEnableRemoting, - switches::kEnableClickToPlay, + switches::kDisableClickToPlay, switches::kEnableResourceContentSettings, switches::kPrelaunchGpuProcess, switches::kEnableAcceleratedCompositing, |