diff options
Diffstat (limited to 'chrome/browser')
9 files changed, 26 insertions, 23 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 7a00e90..c03fc8f 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -311,7 +311,8 @@ bool HostContentSettingsMap::IsSettingAllowedForType( ContentSetting setting, ContentSettingsType content_type) { // Intents content settings are hidden behind a switch for now. if (content_type == CONTENT_SETTINGS_TYPE_INTENTS && - CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents)) + !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebIntents)) return false; // BLOCK semantics are not implemented for fullscreen. diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html index 8ded164..cfd82ff 100644 --- a/chrome/browser/resources/options/options.html +++ b/chrome/browser/resources/options/options.html @@ -30,7 +30,7 @@ <link rel="stylesheet" href="handler_options.css"> </if> <link rel="stylesheet" href="import_data_overlay.css"> -<if expr="pp_ifdef('enable_web_intents_tag')"> +<if expr="pp_ifdef('enable_web_intents')"> <link rel="stylesheet" href="intents_view.css"> </if> <link rel="stylesheet" href="language_options.css"> @@ -175,7 +175,7 @@ <if expr="pp_ifdef('enable_register_protocol_handler')"> <include src="handler_options.html"> </if> - <if expr="pp_ifdef('enable_web_intents_tag')"> + <if expr="pp_ifdef('enable_web_intents')"> <include src="intents_view.html"> </if> <include src="content_settings_exceptions_area.html"> diff --git a/chrome/browser/resources/options/options_bundle.js b/chrome/browser/resources/options/options_bundle.js index d156edb..0298858 100644 --- a/chrome/browser/resources/options/options_bundle.js +++ b/chrome/browser/resources/options/options_bundle.js @@ -76,7 +76,7 @@ </if> <include src="import_data_overlay.js"></include> <include src="instant_confirm_overlay.js"></include> -<if expr="pp_ifdef('enable_web_intents_tag')"> +<if expr="pp_ifdef('enable_web_intents')"> <include src="intents_list.js"></include> <include src="intents_view.js"></include> </if> diff --git a/chrome/browser/resources/options2/content_settings.html b/chrome/browser/resources/options2/content_settings.html index ba62d90..bd21b0c 100644 --- a/chrome/browser/resources/options2/content_settings.html +++ b/chrome/browser/resources/options2/content_settings.html @@ -246,7 +246,7 @@ </div> </section> <!-- Intent registration filter tab contents --> - <if expr="pp_ifdef('enable_web_intents_tag')"> + <if expr="pp_ifdef('enable_web_intents')"> <section id="intents-section"> <h3 i18n-content="intentsTabLabel" class="content-settings-header"></h3> <div> diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html index e99ad52..1a332ed 100644 --- a/chrome/browser/resources/options2/options.html +++ b/chrome/browser/resources/options2/options.html @@ -29,7 +29,7 @@ <link rel="stylesheet" href="handler_options.css"> </if> <link rel="stylesheet" href="import_data_overlay.css"> -<if expr="pp_ifdef('enable_web_intents_tag')"> +<if expr="pp_ifdef('enable_web_intents')"> <link rel="stylesheet" href="intents_view.css"> </if> <link rel="stylesheet" href="language_options.css"> @@ -172,7 +172,7 @@ <if expr="pp_ifdef('enable_register_protocol_handler')"> <include src="handler_options.html"> </if> - <if expr="pp_ifdef('enable_web_intents_tag')"> + <if expr="pp_ifdef('enable_web_intents')"> <include src="intents_view.html"> </if> <include src="content_settings_exceptions_area.html"> diff --git a/chrome/browser/resources/options2/options_bundle.js b/chrome/browser/resources/options2/options_bundle.js index 9b22548..dc930ba 100644 --- a/chrome/browser/resources/options2/options_bundle.js +++ b/chrome/browser/resources/options2/options_bundle.js @@ -77,7 +77,7 @@ <include src="home_page_overlay.js"></include> <include src="import_data_overlay.js"></include> <include src="instant_confirm_overlay.js"></include> -<if expr="pp_ifdef('enable_web_intents_tag')"> +<if expr="pp_ifdef('enable_web_intents')"> <include src="intents_list.js"></include> <include src="intents_view.js"></include> </if> diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 97a6c2b..4733c5f 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -2704,7 +2704,7 @@ void Browser::RegisterIntentHandlerHelper(WebContents* tab, const string16& href, const string16& title, const string16& disposition) { - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents)) + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) return; TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents( @@ -4044,7 +4044,7 @@ void Browser::RegisterIntentHandler(WebContents* tab, void Browser::WebIntentDispatch( WebContents* tab, content::WebIntentsDispatcher* intents_dispatcher) { - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents)) + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) return; TabContentsWrapper* tcw = diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 5ce2729..d1de2d55 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -281,8 +281,8 @@ void ContentSettingsHandler::GetLocalizedValues( RegisterTitle(localized_strings, "contentSettingsPage", IDS_CONTENT_SETTINGS_TITLE); localized_strings->SetBoolean("enable_web_intents", - !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableWebIntents)); + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebIntents)); } void ContentSettingsHandler::Initialize() { @@ -435,9 +435,10 @@ void ContentSettingsHandler::UpdateAllOTRExceptionsViewsFromModel() { void ContentSettingsHandler::UpdateExceptionsViewFromModel( ContentSettingsType type) { - // Don't update intents settings at this point. - // Turn on when enable_web_intents_tag is enabled. - if (type == CONTENT_SETTINGS_TYPE_INTENTS) + // Skip updating intents unless it's enabled from the command line. + if (type == CONTENT_SETTINGS_TYPE_INTENTS && + !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebIntents)) return; switch (type) { diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler2.cc index 511f1f5..8b58dee 100644 --- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc +++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -283,8 +283,8 @@ void ContentSettingsHandler::GetLocalizedValues( RegisterTitle(localized_strings, "contentSettingsPage", IDS_CONTENT_SETTINGS_TITLE); localized_strings->SetBoolean("enable_web_intents", - !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableWebIntents)); + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebIntents)); } void ContentSettingsHandler::Initialize() { @@ -437,9 +437,10 @@ void ContentSettingsHandler::UpdateAllOTRExceptionsViewsFromModel() { void ContentSettingsHandler::UpdateExceptionsViewFromModel( ContentSettingsType type) { - // Don't update intents settings at this point. - // Turn on when enable_web_intents_tag is enabled. - if (type == CONTENT_SETTINGS_TYPE_INTENTS) + // Skip updating intents unless it's enabled from the command line. + if (type == CONTENT_SETTINGS_TYPE_INTENTS && + !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebIntents)) return; switch (type) { |