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

Unified Diff: chrome/browser/ui/webui/options2/content_settings_handler2.cc

Issue 9271084: Revert 119306 - Turn web intents build flag 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/webui/options/content_settings_handler.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698