| Index: chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| index 320cbd5115c3df57170e98c496a1d960acc23a1a..7b92e5e62ad9af5eb4f42b4949c97ad1fd7b4046 100644
|
| --- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| @@ -286,8 +286,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() {
|
| @@ -440,10 +440,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) {
|
|
|