| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1856 g_browser_process->oom_priority_manager()->Start(); | 1856 g_browser_process->oom_priority_manager()->Start(); |
| 1857 #endif | 1857 #endif |
| 1858 | 1858 |
| 1859 // Create the instance of the cloud print proxy service so that it can launch | 1859 // Create the instance of the cloud print proxy service so that it can launch |
| 1860 // the service process if needed. This is needed because the service process | 1860 // the service process if needed. This is needed because the service process |
| 1861 // might have shutdown because an update was available. | 1861 // might have shutdown because an update was available. |
| 1862 // TODO(torne): this should maybe be done with | 1862 // TODO(torne): this should maybe be done with |
| 1863 // ProfileKeyedServiceFactory::ServiceIsCreatedWithProfile() instead? | 1863 // ProfileKeyedServiceFactory::ServiceIsCreatedWithProfile() instead? |
| 1864 CloudPrintProxyServiceFactory::GetForProfile(profile_); | 1864 CloudPrintProxyServiceFactory::GetForProfile(profile_); |
| 1865 | 1865 |
| 1866 // Initialize GpuDataManager and collect preliminary gpu info on FILE thread. | 1866 // Initialize GpuDataManager and collect preliminary gpu info. |
| 1867 // Upon completion, it posts GpuBlacklist auto update task on UI thread. | 1867 GpuBlacklistUpdater::Setup(); |
| 1868 BrowserThread::PostTask( | |
| 1869 BrowserThread::FILE, FROM_HERE, | |
| 1870 base::Bind(&GpuBlacklistUpdater::SetupOnFileThread)); | |
| 1871 | 1868 |
| 1872 // Start watching all browser threads for responsiveness. | 1869 // Start watching all browser threads for responsiveness. |
| 1873 ThreadWatcherList::StartWatchingAll(parsed_command_line()); | 1870 ThreadWatcherList::StartWatchingAll(parsed_command_line()); |
| 1874 | 1871 |
| 1875 #if !defined(DISABLE_NACL) | 1872 #if !defined(DISABLE_NACL) |
| 1876 NaClProcessHost::EarlyStartup(); | 1873 NaClProcessHost::EarlyStartup(); |
| 1877 #endif | 1874 #endif |
| 1878 | 1875 |
| 1879 // Instantiate the notification UI manager, as this triggers a perf timer | 1876 // Instantiate the notification UI manager, as this triggers a perf timer |
| 1880 // used to measure startup time. TODO(stevenjb): Figure out what is actually | 1877 // used to measure startup time. TODO(stevenjb): Figure out what is actually |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2112 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && | 2109 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && |
| 2113 (pre_read == "0" || pre_read == "1")) { | 2110 (pre_read == "0" || pre_read == "1")) { |
| 2114 std::string uma_name(name); | 2111 std::string uma_name(name); |
| 2115 uma_name += "_PreRead"; | 2112 uma_name += "_PreRead"; |
| 2116 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 2113 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
| 2117 AddPreReadHistogramTime(uma_name.c_str(), time); | 2114 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 2118 } | 2115 } |
| 2119 #endif | 2116 #endif |
| 2120 #endif | 2117 #endif |
| 2121 } | 2118 } |
| OLD | NEW |