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

Unified Diff: content/browser/intents/intent_injector.cc

Issue 9536023: Revert 124228 - Revert 119423 - Revert 119306 - Turn web intents build flag on. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src/
Patch Set: Created 8 years, 10 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/common/extensions/extension_manifests_unittest.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/intents/intent_injector.cc
===================================================================
--- content/browser/intents/intent_injector.cc (revision 124239)
+++ content/browser/intents/intent_injector.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.
@@ -56,8 +56,8 @@
void IntentInjector::RenderViewCreated(RenderViewHost* render_view_host) {
if (source_intent_.get() == NULL ||
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableWebIntents) ||
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableWebIntents) ||
web_contents()->GetRenderViewHost() == NULL) {
return;
}
@@ -77,7 +77,7 @@
void IntentInjector::OnReply(webkit_glue::WebIntentReplyType reply_type,
const string16& data) {
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents))
NOTREACHED();
if (intents_dispatcher_) {
« no previous file with comments | « chrome/common/extensions/extension_manifests_unittest.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698