| 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 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1224 } | 1224 } |
| 1225 #endif // defined(MOJO_RUNNER_CLIENT) | 1225 #endif // defined(MOJO_RUNNER_CLIENT) |
| 1226 | 1226 |
| 1227 #if defined(OS_WIN) | 1227 #if defined(OS_WIN) |
| 1228 // Windows parental controls calls can be slow, so we do an early init here | 1228 // Windows parental controls calls can be slow, so we do an early init here |
| 1229 // that calculates this value off of the UI thread. | 1229 // that calculates this value off of the UI thread. |
| 1230 IncognitoModePrefs::InitializePlatformParentalControls(); | 1230 IncognitoModePrefs::InitializePlatformParentalControls(); |
| 1231 #endif | 1231 #endif |
| 1232 | 1232 |
| 1233 #if defined(ENABLE_EXTENSIONS) | 1233 #if defined(ENABLE_EXTENSIONS) |
| 1234 if (!variations::GetVariationParamValue( | 1234 // Try to compute this early on another thread so that we don't spend time |
| 1235 "LightSpeed", "EarlyInitStartup").empty()) { | 1235 // during profile load initializing the extensions APIs. |
| 1236 // Try to compute this early on another thread so that we don't spend time | 1236 BrowserThread::PostTask( |
| 1237 // during profile load initializing the extensions APIs. | 1237 BrowserThread::FILE_USER_BLOCKING, |
| 1238 BrowserThread::PostTask( | 1238 FROM_HERE, |
| 1239 BrowserThread::FILE_USER_BLOCKING, | 1239 base::Bind( |
| 1240 FROM_HERE, | 1240 base::IgnoreResult(&extensions::FeatureProvider::GetAPIFeatures))); |
| 1241 base::Bind( | |
| 1242 base::IgnoreResult(&extensions::FeatureProvider::GetAPIFeatures))); | |
| 1243 } | |
| 1244 #endif | 1241 #endif |
| 1245 | 1242 |
| 1246 // Android updates the metrics service dynamically depending on whether the | 1243 // Android updates the metrics service dynamically depending on whether the |
| 1247 // application is in the foreground or not. Do not start here. | 1244 // application is in the foreground or not. Do not start here. |
| 1248 #if !defined(OS_ANDROID) | 1245 #if !defined(OS_ANDROID) |
| 1249 // Now that the file thread has been started, start recording. | 1246 // Now that the file thread has been started, start recording. |
| 1250 StartMetricsRecording(); | 1247 StartMetricsRecording(); |
| 1251 #endif // !defined(OS_ANDROID) | 1248 #endif // !defined(OS_ANDROID) |
| 1252 | 1249 |
| 1253 if (!base::debug::BeingDebugged()) { | 1250 if (!base::debug::BeingDebugged()) { |
| (...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1862 chromeos::CrosSettings::Shutdown(); | 1859 chromeos::CrosSettings::Shutdown(); |
| 1863 #endif // defined(OS_CHROMEOS) | 1860 #endif // defined(OS_CHROMEOS) |
| 1864 #endif // defined(OS_ANDROID) | 1861 #endif // defined(OS_ANDROID) |
| 1865 } | 1862 } |
| 1866 | 1863 |
| 1867 // Public members: | 1864 // Public members: |
| 1868 | 1865 |
| 1869 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1866 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1870 chrome_extra_parts_.push_back(parts); | 1867 chrome_extra_parts_.push_back(parts); |
| 1871 } | 1868 } |
| OLD | NEW |