diff options
| -rw-r--r-- | chrome/browser/extensions/installed_loader.cc | 2 | ||||
| -rw-r--r-- | extensions/common/api/api.gyp | 1 | ||||
| -rw-r--r-- | extensions/extensions.gyp | 9 | ||||
| -rw-r--r-- | extensions/renderer/messaging_bindings.cc | 9 |
4 files changed, 18 insertions, 3 deletions
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 062ef79..feb8fe7 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -21,9 +21,9 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" -#include "extensions/browser/api/runtime/runtime_api.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" diff --git a/extensions/common/api/api.gyp b/extensions/common/api/api.gyp index 9fd2c73..5fb5041 100644 --- a/extensions/common/api/api.gyp +++ b/extensions/common/api/api.gyp @@ -43,7 +43,6 @@ }, { # TODO: Eliminate these on Android. See crbug.com/305852. 'schema_files': [ - 'extensions_manifest_types.json', 'runtime.json', ], }], diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index c3136aa..638e179 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -220,7 +220,16 @@ ], }, { # enable_extensions == 0 'sources!': [ + 'common/api/messaging/message.h', + 'common/api/sockets/sockets_manifest_data.cc', + 'common/api/sockets/sockets_manifest_data.h', + 'common/api/sockets/sockets_manifest_handler.cc', + 'common/api/sockets/sockets_manifest_handler.h', + 'common/api/sockets/sockets_manifest_permission.cc', + 'common/api/sockets/sockets_manifest_permission.h', 'common/extension_api.cc', + 'common/manifest_handlers/externally_connectable.cc', + 'common/manifest_handlers/externally_connectable.h', ], }], ], diff --git a/extensions/renderer/messaging_bindings.cc b/extensions/renderer/messaging_bindings.cc index fea9a19..860a99e 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[] = { |