Revert 119284 - Turn web intents build flag on. Move the command-line flag to default 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 119305)
+++ chrome/browser/ui/webui/options2/content_settings_handler2.cc	(working copy)
@@ -286,8 +286,8 @@
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClickToPlay));
   localized_strings->SetBoolean("enable_web_intents",
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableWebIntents));
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableWebIntents));
 }
 
 void ContentSettingsHandler::Initialize() {
@@ -440,10 +440,10 @@
 
 void ContentSettingsHandler::UpdateExceptionsViewFromModel(
     ContentSettingsType type) {
-  // Update intents unless it's disabled from the command line.
+  // Skip updating intents unless it's enabled from the command line.
   if (type == CONTENT_SETTINGS_TYPE_INTENTS &&
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableWebIntents))
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableWebIntents))
     return;
 
   switch (type) {
Property changes on: chrome/browser/ui/webui/options2/content_settings_handler2.cc
___________________________________________________________________
Deleted: svn:mergeinfo