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

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

Issue 9212036: 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: Merge to head 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
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index fabd1dca1b2ce168f98d991ec6627b9235e40596..5170e670ef3a5fd8f17621097ee0642084d18cf0 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -284,8 +284,8 @@ void ContentSettingsHandler::GetLocalizedValues(
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableClickToPlay));
localized_strings->SetBoolean("enable_web_intents",
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableWebIntents));
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableWebIntents));
}
void ContentSettingsHandler::Initialize() {
@@ -438,10 +438,10 @@ void ContentSettingsHandler::UpdateAllOTRExceptionsViewsFromModel() {
void ContentSettingsHandler::UpdateExceptionsViewFromModel(
ContentSettingsType type) {
- // Skip updating intents unless it's enabled from the command line.
+ // Update intents unless it's disabled from the command line.
if (type == CONTENT_SETTINGS_TYPE_INTENTS &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableWebIntents))
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableWebIntents))
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