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

Unified Diff: extensions/renderer/messaging_bindings.cc

Issue 672403002: Cleanup: Remove most enable_extensions logic in extensions code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android Created 6 years, 2 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 | « extensions/renderer/dom_activity_logger.cc ('k') | extensions/shell/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/messaging_bindings.cc
diff --git a/extensions/renderer/messaging_bindings.cc b/extensions/renderer/messaging_bindings.cc
index 7902cc08a60953e85d6e7b0cd717ff4d3daec46e..cbb9ec2c9ed1491d452e0ae73c8666189ed9e805 100644
--- a/extensions/renderer/messaging_bindings.cc
+++ b/extensions/renderer/messaging_bindings.cc
@@ -18,6 +18,7 @@
#include "content/public/renderer/v8_value_converter.h"
#include "extensions/common/api/messaging/message.h"
#include "extensions/common/extension_messages.h"
+#include "extensions/common/manifest_handlers/externally_connectable.h"
#include "extensions/renderer/dispatcher.h"
#include "extensions/renderer/event_bindings.h"
#include "extensions/renderer/object_backed_native_handler.h"
@@ -30,12 +31,6 @@
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "v8/include/v8.h"
-// TODO(thestig): Remove #ifdef from this file when extensions are no longer
-// used on mobile.
-#if defined(ENABLE_EXTENSIONS)
-#include "extensions/common/manifest_handlers/externally_connectable.h"
-#endif
-
// Message passing API example (in a content script):
// var extension =
// new chrome.Extension('00123456789abcdef0123456789abcdef0123456');
@@ -266,7 +261,6 @@ void DispatchOnConnectToScriptContext(
if (!source_tab->empty() && !extension->is_platform_app())
tab = converter->ToV8Value(source_tab, script_context->v8_context());
-#if defined(ENABLE_EXTENSIONS)
ExternallyConnectableInfo* externally_connectable =
ExternallyConnectableInfo::Get(extension);
if (externally_connectable &&
@@ -276,7 +270,6 @@ void DispatchOnConnectToScriptContext(
v8::String::kNormalString,
tls_channel_id.size());
}
-#endif
}
v8::Handle<v8::Value> arguments[] = {
« no previous file with comments | « extensions/renderer/dom_activity_logger.cc ('k') | extensions/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698