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

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.cc

Issue 9113095: Revert 119284 - Turn web intents build flag on. Move the command-line flag to default on. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 months 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/ui/browser.cc ('k') | chrome/browser/ui/webui/options2/content_settings_handler2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/content_settings_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/content_settings_handler.cc (revision 119305)
+++ chrome/browser/ui/webui/options/content_settings_handler.cc (working copy)
@@ -284,8 +284,8 @@
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableClickToPlay));
localized_strings->SetBoolean("enable_web_intents",
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableWebIntents));
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableWebIntents));
}
void ContentSettingsHandler::Initialize() {
@@ -438,10 +438,10 @@
void ContentSettingsHandler::UpdateExceptionsViewFromModel(
ContentSettingsType type) {
- // Update intents unless it's disabled from the command line.
+ // Skip updating intents unless it's enabled from the command line.
if (type == CONTENT_SETTINGS_TYPE_INTENTS &&
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableWebIntents))
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableWebIntents))
return;
switch (type) {
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/webui/options2/content_settings_handler2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698