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

Unified Diff: extensions/renderer/messaging_bindings.cc

Issue 396933002: Remove extensions_manifest_types extensions API on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/extensions.gyp ('k') | no next file » | 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 fea9a19f667dff2e334ccd6e3e78a0576d9c7604..860a99e994ab4bcfecc288c9f930cb71503db97e 100644
--- a/extensions/renderer/messaging_bindings.cc
+++ b/extensions/renderer/messaging_bindings.cc
@@ -18,7 +18,6 @@
#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"
@@ -31,6 +30,12 @@
#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');
@@ -261,6 +266,7 @@ 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 &&
@@ -270,6 +276,7 @@ void DispatchOnConnectToScriptContext(
v8::String::kNormalString,
tls_channel_id.size());
}
+#endif
}
v8::Handle<v8::Value> arguments[] = {
« no previous file with comments | « extensions/extensions.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698