OLD | NEW |
---|---|
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 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1049 } | 1049 } |
1050 | 1050 |
1051 void ChromeBrowserMainParts::PostBrowserStart() { | 1051 void ChromeBrowserMainParts::PostBrowserStart() { |
1052 #if !defined(OS_ANDROID) | 1052 #if !defined(OS_ANDROID) |
1053 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs)) | 1053 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs)) |
1054 RunPageCycler(); | 1054 RunPageCycler(); |
1055 #endif | 1055 #endif |
1056 | 1056 |
1057 // Create the instance of the Google Now service. | 1057 // Create the instance of the Google Now service. |
1058 #if defined(ENABLE_GOOGLE_NOW) | 1058 #if defined(ENABLE_GOOGLE_NOW) |
1059 if (CommandLine::ForCurrentProcess()->HasSwitch( | 1059 // TODO(vadim): Remove C++ Google Now implementation. |
1060 switches::kEnableGoogleNowIntegration)) { | 1060 // if (CommandLine::ForCurrentProcess()->HasSwitch( |
1061 GoogleNowServiceFactory::GetForProfile(profile_); | 1061 // switches::kEnableGoogleNowIntegration)) { |
skare_
2013/03/06 22:08:01
can this block just be removed altogether, and fil
vadimt
2013/03/06 22:37:12
This text has 2 parts:
(1) TODO item. TODO's are
skare_
2013/03/07 00:56:39
1) consider an actual bug for this case since we'l
vadimt
2013/03/07 22:33:07
Removed. We have a TODO item in JS code to remove
| |
1062 } | 1062 // GoogleNowServiceFactory::GetForProfile(profile_); |
1063 // } | |
1063 #endif | 1064 #endif |
1064 | 1065 |
1065 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1066 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1066 chrome_extra_parts_[i]->PostBrowserStart(); | 1067 chrome_extra_parts_[i]->PostBrowserStart(); |
1067 #if !defined(OS_ANDROID) | 1068 #if !defined(OS_ANDROID) |
1068 // Allow ProcessSingleton to process messages. | 1069 // Allow ProcessSingleton to process messages. |
1069 process_singleton_->Unlock(); | 1070 process_singleton_->Unlock(); |
1070 #endif | 1071 #endif |
1071 } | 1072 } |
1072 | 1073 |
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1798 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1799 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1799 uma_name += "_XP"; | 1800 uma_name += "_XP"; |
1800 | 1801 |
1801 uma_name += "_PreRead_"; | 1802 uma_name += "_PreRead_"; |
1802 uma_name += pre_read_percentage; | 1803 uma_name += pre_read_percentage; |
1803 AddPreReadHistogramTime(uma_name.c_str(), time); | 1804 AddPreReadHistogramTime(uma_name.c_str(), time); |
1804 } | 1805 } |
1805 #endif | 1806 #endif |
1806 #endif | 1807 #endif |
1807 } | 1808 } |
OLD | NEW |