Revert 124228 - Revert 119423 - Revert 119306 - Turn web intents build flag on.

chrome/browser/ui/webui/options2/content_settings_handler2.cc

Index: chrome/browser/ui/webui/options2/content_settings_handler2.cc
===================================================================
--- chrome/browser/ui/webui/options2/content_settings_handler2.cc	(revision 124239)
+++ chrome/browser/ui/webui/options2/content_settings_handler2.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 @@
   RegisterTitle(localized_strings, "contentSettingsPage",
                 IDS_CONTENT_SETTINGS_TITLE);
   localized_strings->SetBoolean("enable_web_intents",
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableWebIntents));
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableWebIntents));
 }
 
 void ContentSettingsHandler::Initialize() {
@@ -437,10 +437,9 @@
 
 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) {