diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 11:36:11 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 11:36:11 +0000 |
| commit | 87fc2cf11f01479fc1b2830fbf24b7f71013bdfc (patch) | |
| tree | fc56bfe946c2240252b4345ecae85d27ef1790b4 /chrome/browser/extensions/component_loader.cc | |
| parent | 3d04b29ad4a40fb29dc4924dbea6a05c2487eb0e (diff) | |
| download | chromium_src-87fc2cf11f01479fc1b2830fbf24b7f71013bdfc.zip chromium_src-87fc2cf11f01479fc1b2830fbf24b7f71013bdfc.tar.gz chromium_src-87fc2cf11f01479fc1b2830fbf24b7f71013bdfc.tar.bz2 | |
Add code to load Hangout Services as a component extension.
Rename the extension from "Hangouts Services" to "Hangout Services".
Add public key and add ID to appropriate whitelists.
TBR=jochen@chromium.org
BUG=291271
Review URL: https://codereview.chromium.org/30833003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/component_loader.cc')
| -rw-r--r-- | chrome/browser/extensions/component_loader.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 36a4c03..b18ad91 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -285,6 +285,11 @@ void ComponentLoader::AddFileManagerExtension() { #endif // defined(FILE_MANAGER_EXTENSION) } +void ComponentLoader::AddHangoutServicesExtension() { + Add(IDR_HANGOUT_SERVICES_MANIFEST, + base::FilePath(FILE_PATH_LITERAL("hangout_services"))); +} + void ComponentLoader::AddImageLoaderExtension() { #if defined(IMAGE_LOADER_EXTENSION) #ifndef NDEBUG @@ -426,7 +431,9 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( base::FilePath(FILE_PATH_LITERAL("apps_debugger"))); } + AddFileManagerExtension(); + AddHangoutServicesExtension(); AddImageLoaderExtension(); #if defined(ENABLE_SETTINGS_APP) |