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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 11412291: Creating a skeleton for Google Now for Chrome implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Final sky's comments. Created 8 years 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 | « build/common.gypi ('k') | chrome/browser/ui/google_now/google_now_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index e93cc98b9bc7e07a81774b6ee4866a12d02dfcd7..68fd3ff14411471d71bc142c674705275559913a 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -173,6 +173,10 @@
#include "policy/policy_constants.h"
#endif
+#if defined(ENABLE_GOOGLE_NOW)
+#include "chrome/browser/ui/google_now/google_now_service_factory.h"
+#endif
+
#if defined(ENABLE_LANGUAGE_DETECTION)
#include "chrome/browser/language_usage_metrics.h"
#endif
@@ -942,6 +946,14 @@ void ChromeBrowserMainParts::PostBrowserStart() {
RunPageCycler();
#endif
+ // Create the instance of the Google Now service.
+#if defined(ENABLE_GOOGLE_NOW)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableGoogleNowIntegration)) {
+ GoogleNowServiceFactory::GetForProfile(profile_);
+ }
+#endif
+
for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
chrome_extra_parts_[i]->PostBrowserStart();
#if !defined(OS_ANDROID)
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/ui/google_now/google_now_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698