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..adddb256ba591216716207658eb9dee1ef49e0a7 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,9 @@ void ContentSettingsHandler::UpdateAllOTRExceptionsViewsFromModel() { |
void ContentSettingsHandler::UpdateExceptionsViewFromModel( |
ContentSettingsType type) { |
- // Skip updating intents unless it's enabled from the command line. |
- if (type == CONTENT_SETTINGS_TYPE_INTENTS && |
- !CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableWebIntents)) |
+ // Don't update intents settings at this point. |
+ // Turn on when enable_web_intents_tag is enabled. |
+ if (type == CONTENT_SETTINGS_TYPE_INTENTS) |
return; |
switch (type) { |