summaryrefslogtreecommitdiffstats
path: root/extensions/shell/common
diff options
context:
space:
mode:
authorjamescook <jamescook@chromium.org>2014-09-19 18:49:02 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-20 01:49:22 +0000
commit4860e1a3ff5fc44544d3ff509424b3688cd0f7f9 (patch)
tree351c86f2c7ac15213e8620d1ee8551b8bd49ab01 /extensions/shell/common
parent7dab582eb44ec4f5eeb46ea99fee0fd15a80bfdc (diff)
downloadchromium_src-4860e1a3ff5fc44544d3ff509424b3688cd0f7f9.zip
chromium_src-4860e1a3ff5fc44544d3ff509424b3688cd0f7f9.tar.gz
chromium_src-4860e1a3ff5fc44544d3ff509424b3688cd0f7f9.tar.bz2
extensions: Move sockets manifest handler registration
It was being done as a one-off in app_shell and replicated in Chrome. Moved it to RegisterCommonManifestHandlers() where it belongs. BUG=none TEST=extensions_unittests, unit_tests Review URL: https://codereview.chromium.org/586873003 Cr-Commit-Position: refs/heads/master@{#295842}
Diffstat (limited to 'extensions/shell/common')
-rw-r--r--extensions/shell/common/shell_extensions_client.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index 493acca..0398413 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -7,7 +7,6 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "extensions/common/api/generated_schemas.h"
-#include "extensions/common/api/sockets/sockets_manifest_handler.h"
#include "extensions/common/common_manifest_handlers.h"
#include "extensions/common/extension_urls.h"
#include "extensions/common/features/api_feature.h"
@@ -85,12 +84,6 @@ ShellExtensionsClient::~ShellExtensionsClient() {
void ShellExtensionsClient::Initialize() {
RegisterCommonManifestHandlers();
-
- // 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 SocketsManifestHandler)->Register();
-
ManifestHandler::FinalizeRegistration();
// TODO(jamescook): Do we need to whitelist any extensions?