Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3794)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_setting_bubble_model.cc

Issue 5238002: Reintegrate 552 r66225-r66645.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552d/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm ('k') | chrome/browser/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_setting_bubble_model.cc
===================================================================
--- chrome/browser/content_setting_bubble_model.cc (revision 66837)
+++ chrome/browser/content_setting_bubble_model.cc (working copy)
@@ -297,16 +297,11 @@
private:
void SetLoadPluginsLinkTitle() {
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableClickToPlay)) {
- set_load_plugins_link_title(
- l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL));
- }
+ set_load_plugins_link_title(
+ l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL));
}
virtual void OnLoadPluginsLinkClicked() {
- DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableClickToPlay));
UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble"));
if (tab_contents()) {
tab_contents()->render_view_host()->LoadBlockedPlugins();
« no previous file with comments | « chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm ('k') | chrome/browser/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698