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

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

Issue 11967029: Initial implementation of Google Now Notifications integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing presubmit check. Created 7 years, 11 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
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index ddccee92826e2dca50dd54d3101f874480fca998..0de58ca613ae04e19606128fb869f0024c92ae32 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -415,6 +415,12 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
}
#endif
+#if defined(ENABLE_GOOGLE_NOW)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableGoogleNowIntegration)) {
+ Add(IDR_GOOGLE_NOW_MANIFEST, FilePath(FILE_PATH_LITERAL("google_now")));
+ }
+#endif
}
void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698