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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_setting_bubble_model_unittest.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.cc ('k') | chrome/browser/content_setting_combo_model.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_unittest.cc
===================================================================
--- chrome/browser/content_setting_bubble_model_unittest.cc (revision 66837)
+++ chrome/browser/content_setting_bubble_model_unittest.cc (working copy)
@@ -109,6 +109,7 @@
CommandLine* cmd = CommandLine::ForCurrentProcess();
AutoReset<CommandLine> auto_reset(cmd, *cmd);
cmd->AppendSwitch(switches::kEnableResourceContentSettings);
+ cmd->AppendSwitch(switches::kEnableClickToPlay);
HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();
std::string fooPlugin = "foo";
« no previous file with comments | « chrome/browser/content_setting_bubble_model.cc ('k') | chrome/browser/content_setting_combo_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698