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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_setting_combo_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/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/gtk/options/content_filter_page_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_setting_combo_model.cc
===================================================================
--- chrome/browser/content_setting_combo_model.cc (revision 66837)
+++ chrome/browser/content_setting_combo_model.cc (working copy)
@@ -36,7 +36,8 @@
}
int ContentSettingComboModel::GetItemCount() {
- if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS)
+ if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableClickToPlay))
return arraysize(kAskSettings);
if (content_type_ == CONTENT_SETTINGS_TYPE_COOKIES)
return arraysize(kSessionSettings);
@@ -60,7 +61,8 @@
}
ContentSetting ContentSettingComboModel::SettingForIndex(int index) {
- if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS)
+ if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableClickToPlay))
return kAskSettings[index];
if (content_type_ == CONTENT_SETTINGS_TYPE_COOKIES)
return kSessionSettings[index];
« no previous file with comments | « chrome/browser/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/gtk/options/content_filter_page_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698