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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/views/options/content_filter_page_view.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/renderer_host/browser_render_process_host.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/options/content_filter_page_view.cc
===================================================================
--- chrome/browser/views/options/content_filter_page_view.cc (revision 66837)
+++ chrome/browser/views/options/content_filter_page_view.cc (working copy)
@@ -101,12 +101,16 @@
};
COMPILE_ASSERT(arraysize(kAskIDs) == CONTENT_SETTINGS_NUM_TYPES,
Need_a_setting_for_every_content_settings_type);
- DCHECK_EQ(arraysize(kAskIDs),
- static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES));
if (content_type_ != CONTENT_SETTINGS_TYPE_COOKIES) {
- if (kAskIDs[content_type_] != 0) {
+ int askID = kAskIDs[content_type_];
+ if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableClickToPlay)) {
+ askID = 0;
+ }
+ if (askID != 0) {
ask_radio_ = new views::RadioButton(
- l10n_util::GetString(kAskIDs[content_type_]), radio_button_group);
+ l10n_util::GetString(askID), radio_button_group);
ask_radio_->set_listener(this);
ask_radio_->SetMultiLine(true);
layout->StartRow(0, single_column_set_id);
« no previous file with comments | « chrome/browser/renderer_host/browser_render_process_host.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698