diff options
| author | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 21:30:33 +0000 |
|---|---|---|
| committer | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 21:30:33 +0000 |
| commit | f8ef26567f19ec8335076f724030f2b0d4f2f841 (patch) | |
| tree | 2b01ca2af39e90cf59efb6844412d6d302911278 /apps/shell | |
| parent | 80a6b9c307cf79152f14a5dc301c6d9c164c0254 (diff) | |
| download | chromium_src-f8ef26567f19ec8335076f724030f2b0d4f2f841.zip chromium_src-f8ef26567f19ec8335076f724030f2b0d4f2f841.tar.gz chromium_src-f8ef26567f19ec8335076f724030f2b0d4f2f841.tar.bz2 | |
Remove Chrome dependencies from sockets API implementations.
This is part of an effort to start separating APIs from src/chrome
and eventually move them into src/extensions.
BUG=347574
TBR=yoz@chromium.org for DEPS
Review URL: https://codereview.chromium.org/185303012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell')
| -rw-r--r-- | apps/shell/common/DEPS | 1 | ||||
| -rw-r--r-- | apps/shell/common/shell_extensions_client.cc | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/apps/shell/common/DEPS b/apps/shell/common/DEPS index cf709d6..c5e4e60 100644 --- a/apps/shell/common/DEPS +++ b/apps/shell/common/DEPS @@ -1,6 +1,7 @@ include_rules = [ # TODO(jamescook): Remove these. http://crbug.com/305404 # Chrome pieces for app_shell bring-up. + "+chrome/common/extensions/api/sockets/sockets_manifest_handler.h", "+chrome/common/extensions/features/base_feature_provider.h", "+chrome/common/extensions/permissions/chrome_api_permissions.h", diff --git a/apps/shell/common/shell_extensions_client.cc b/apps/shell/common/shell_extensions_client.cc index 2b2619e..99a68fb 100644 --- a/apps/shell/common/shell_extensions_client.cc +++ b/apps/shell/common/shell_extensions_client.cc @@ -5,6 +5,7 @@ #include "apps/shell/common/shell_extensions_client.h" #include "base/logging.h" +#include "chrome/common/extensions/api/sockets/sockets_manifest_handler.h" #include "chrome/common/extensions/features/base_feature_provider.h" #include "chrome/common/extensions/permissions/chrome_api_permissions.h" #include "extensions/common/common_manifest_handlers.h" @@ -76,8 +77,13 @@ ShellExtensionsClient::~ShellExtensionsClient() { void ShellExtensionsClient::Initialize() { extensions::RegisterCommonManifestHandlers(); - extensions::ManifestHandler::FinalizeRegistration(); + // TODO(rockot): API manifest handlers which move out to src/extensions + // should either end up in RegisterCommonManifestHandlers or some new + // initialization step specifically for API manifest handlers. + (new extensions::SocketsManifestHandler)->Register(); + + extensions::ManifestHandler::FinalizeRegistration(); // TODO(jamescook): Do we need to whitelist any extensions? } |