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

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: Fixing a typo. 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
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..bbcaf4934687fcaab23a25264821ee760e1908a6 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -84,6 +84,7 @@
#include "chrome/browser/translate/translate_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/google_now/google_now_service_factory.h"
#include "chrome/browser/ui/startup/default_browser_prompt.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/uma_browsing_activity_observer.h"
@@ -1406,6 +1407,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
CloudPrintProxyServiceFactory::GetForProfile(profile_);
#endif
+ // Create the instance of the Google Now service.
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
sky 2012/12/06 16:40:54 Would it be better to have a feature level ifdef,
vadimt 2012/12/06 20:43:16 Done.
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
sky 2012/12/06 16:40:54 Do we really need to do this right at startup? Or
vadimt 2012/12/06 20:43:16 Well, it will instantiate several objects and post
sky 2012/12/06 21:07:07 I don't know enough about this feature to suggest
vadimt 2012/12/07 02:41:23 Moved past starting browser.
+ switches::kEnableGoogleNowIntegration)) {
+ GoogleNowServiceFactory::GetForProfile(profile_);
+ }
+#endif
+
// Start watching all browser threads for responsiveness.
ThreadWatcherList::StartWatchingAll(parsed_command_line());
« no previous file with comments | « no previous file | chrome/browser/ui/google_now/google_now_service.h » ('j') | chrome/browser/ui/google_now/google_now_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698