summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/intents/intent_injector.cc6
-rw-r--r--content/public/common/content_switches.cc2
-rw-r--r--content/public/common/content_switches.h2
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[];