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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 12508004: Enabling testing Google Now component extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing unnecessary workaround. Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/google_now/background.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 1054
1055 three_d_observer_.reset(new ThreeDAPIObserver()); 1055 three_d_observer_.reset(new ThreeDAPIObserver());
1056 } 1056 }
1057 1057
1058 void ChromeBrowserMainParts::PostBrowserStart() { 1058 void ChromeBrowserMainParts::PostBrowserStart() {
1059 #if !defined(OS_ANDROID) 1059 #if !defined(OS_ANDROID)
1060 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs)) 1060 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs))
1061 RunPageCycler(); 1061 RunPageCycler();
1062 #endif 1062 #endif
1063 1063
1064 // Create the instance of the Google Now service.
1065 #if defined(ENABLE_GOOGLE_NOW)
1066 if (CommandLine::ForCurrentProcess()->HasSwitch(
1067 switches::kEnableGoogleNowIntegration)) {
1068 GoogleNowServiceFactory::GetForProfile(profile_);
1069 }
1070 #endif
1071
1072 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1064 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1073 chrome_extra_parts_[i]->PostBrowserStart(); 1065 chrome_extra_parts_[i]->PostBrowserStart();
1074 #if !defined(OS_ANDROID) 1066 #if !defined(OS_ANDROID)
1075 // Allow ProcessSingleton to process messages. 1067 // Allow ProcessSingleton to process messages.
1076 process_singleton_->Unlock(); 1068 process_singleton_->Unlock();
1077 #endif 1069 #endif
1078 } 1070 }
1079 1071
1080 #if !defined(OS_ANDROID) 1072 #if !defined(OS_ANDROID)
1081 void ChromeBrowserMainParts::RunPageCycler() { 1073 void ChromeBrowserMainParts::RunPageCycler() {
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 if (base::win::GetVersion() <= base::win::VERSION_XP) 1802 if (base::win::GetVersion() <= base::win::VERSION_XP)
1811 uma_name += "_XP"; 1803 uma_name += "_XP";
1812 1804
1813 uma_name += "_PreRead_"; 1805 uma_name += "_PreRead_";
1814 uma_name += pre_read_percentage; 1806 uma_name += pre_read_percentage;
1815 AddPreReadHistogramTime(uma_name.c_str(), time); 1807 AddPreReadHistogramTime(uma_name.c_str(), time);
1816 } 1808 }
1817 #endif 1809 #endif
1818 #endif 1810 #endif
1819 } 1811 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/google_now/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698