diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 22:56:39 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 22:56:39 +0000 |
| commit | 325d03405283095a8b1f315da224dbd11377488b (patch) | |
| tree | 4802ae0595dc563cfb2260bf68399b2cc9d1bed3 /content | |
| parent | ea0a505eb5076a40cbc6453fe46f028875f6b3c0 (diff) | |
| download | chromium_src-325d03405283095a8b1f315da224dbd11377488b.zip chromium_src-325d03405283095a8b1f315da224dbd11377488b.tar.gz chromium_src-325d03405283095a8b1f315da224dbd11377488b.tar.bz2 | |
Revert 119284 - Turn web intents build flag on. Move the command-line flag to default on.
Make the flag disable rather than enable web intents.
Put the options UI behind a new flag controlling functionality if the registration tag is present for web content.
IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.
R=jhawkins@chromium.org
BUG=90458
TEST=None
Review URL: https://chromiumcodereview.appspot.com/9212036
TBR=gbillock@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9113095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/intents/intent_injector.cc | 6 | ||||
| -rw-r--r-- | content/public/common/content_switches.cc | 2 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/intents/intent_injector.cc b/content/browser/intents/intent_injector.cc index f61afca..65daff0 100644 --- a/content/browser/intents/intent_injector.cc +++ b/content/browser/intents/intent_injector.cc @@ -66,8 +66,8 @@ void IntentInjector::DidNavigateMainFrame( // like it might be racy, though. void IntentInjector::SendIntent() { if (source_intent_.get() == NULL || - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableWebIntents) || + !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebIntents) || web_contents()->GetRenderViewHost() == NULL) { return; } @@ -90,7 +90,7 @@ bool IntentInjector::OnMessageReceived(const IPC::Message& message) { void IntentInjector::OnReply(webkit_glue::WebIntentReplyType reply_type, const string16& data) { - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents)) + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) NOTREACHED(); if (intents_dispatcher_) { diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index b52ff9f..d8d66af 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -285,7 +285,7 @@ const char kEnableVideoFullscreen[] = "enable-video-fullscreen"; const char kEnableVideoTrack[] = "enable-video-track"; // Enable Web Intents. -const char kDisableWebIntents[] = "disable-web-intents"; +const char kEnableWebIntents[] = "enable-web-intents"; // Enables experimental features for the geolocation API. // Current features: diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index bb3077e..f1afadc 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -95,7 +95,7 @@ CONTENT_EXPORT extern const char kEnableTcpFastOpen[]; CONTENT_EXPORT extern const char kEnableTouchEvents[]; extern const char kEnableVideoFullscreen[]; CONTENT_EXPORT extern const char kEnableVideoTrack[]; -CONTENT_EXPORT extern const char kDisableWebIntents[]; +CONTENT_EXPORT extern const char kEnableWebIntents[]; CONTENT_EXPORT extern const char kExperimentalLocationFeatures[]; extern const char kExtraPluginDir[]; extern const char kForceFieldTestNameAndValue[]; |