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

Unified Diff: chrome/browser/extensions/component_loader.cc

Issue 30833003: Add code to load Hangout Services as a component extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for tryjobs. Created 7 years, 2 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
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 1f802b5164650d1b718568cb81f846bf45272e57..cb28144cb441a212992ac7b287856f31ed9bfe63 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();
Yoyo Zhou 2013/10/23 23:24:27 Can this (and other such functions) be in an anony
Jói 2013/10/24 08:23:31 Without some larger changes, they need to be membe
AddImageLoaderExtension();
#if defined(ENABLE_SETTINGS_APP)
« no previous file with comments | « chrome/browser/extensions/component_loader.h ('k') | chrome/browser/resources/hangout_services/icon_128.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698