summaryrefslogtreecommitdiffstats
path: root/extensions/renderer/messaging_bindings.cc
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-10-31 17:51:31 -0700
committerCommit bot <commit-bot@chromium.org>2014-11-01 00:52:23 +0000
commitda556afcb3defaa2c929797dbe09711d04279b79 (patch)
treedfcd57b8007b3674df0481e1169562d4348fccfa /extensions/renderer/messaging_bindings.cc
parent8c848c3f4b03bceab3e847f833afd0d6bd9dd4f5 (diff)
downloadchromium_src-da556afcb3defaa2c929797dbe09711d04279b79.zip
chromium_src-da556afcb3defaa2c929797dbe09711d04279b79.tar.gz
chromium_src-da556afcb3defaa2c929797dbe09711d04279b79.tar.bz2
Cleanup: Remove most enable_extensions logic in extensions code.
They are no longer needed since nearly no extensions code gets built when extensions are disabled. Review URL: https://codereview.chromium.org/672403002 Cr-Commit-Position: refs/heads/master@{#302369}
Diffstat (limited to 'extensions/renderer/messaging_bindings.cc')
-rw-r--r--extensions/renderer/messaging_bindings.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/extensions/renderer/messaging_bindings.cc b/extensions/renderer/messaging_bindings.cc
index 7902cc0..cbb9ec2 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[] = {