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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/gtk/options/content_filter_page_gtk.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_combo_model.cc ('k') | chrome/browser/host_content_settings_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/content_filter_page_gtk.cc
===================================================================
--- chrome/browser/gtk/options/content_filter_page_gtk.cc (revision 66837)
+++ chrome/browser/gtk/options/content_filter_page_gtk.cc (working copy)
@@ -83,10 +83,17 @@
};
COMPILE_ASSERT(arraysize(kAskIDs) == CONTENT_SETTINGS_NUM_TYPES,
kAskIDs_IncorrectSize);
- if (kAskIDs[content_type_]) {
+ int askID = kAskIDs[content_type_];
+ if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableClickToPlay)) {
+ askID = 0;
+ }
+
+ if (askID) {
ask_radio_ = gtk_radio_button_new_with_label_from_widget(
GTK_RADIO_BUTTON(allow_radio_),
- l10n_util::GetStringUTF8(kAskIDs[content_type_]).c_str());
+ l10n_util::GetStringUTF8(askID).c_str());
gtk_box_pack_start(GTK_BOX(vbox), ask_radio_, FALSE, FALSE, 0);
}
« no previous file with comments | « chrome/browser/content_setting_combo_model.cc ('k') | chrome/browser/host_content_settings_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698