Chromium Code Reviews| 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 1842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1853 BrowserThread::FILE, FROM_HERE, | 1853 BrowserThread::FILE, FROM_HERE, |
| 1854 base::Bind(&GpuBlacklistUpdater::SetupOnFileThread)); | 1854 base::Bind(&GpuBlacklistUpdater::SetupOnFileThread)); |
| 1855 | 1855 |
| 1856 // Start watching all browser threads for responsiveness. | 1856 // Start watching all browser threads for responsiveness. |
| 1857 ThreadWatcherList::StartWatchingAll(parsed_command_line()); | 1857 ThreadWatcherList::StartWatchingAll(parsed_command_line()); |
| 1858 | 1858 |
| 1859 #if !defined(DISABLE_NACL) | 1859 #if !defined(DISABLE_NACL) |
| 1860 NaClProcessHost::EarlyStartup(); | 1860 NaClProcessHost::EarlyStartup(); |
| 1861 #endif | 1861 #endif |
| 1862 | 1862 |
| 1863 // Instantiate the notification UI manager, as this triggers a perf timer | |
| 1864 // used to measure startup time. TODO(stevenjb): Figure out what is actually | |
|
jam
2011/11/22 00:30:57
nit: please link to a bug number
| |
| 1865 // triggering the timer and call that explicitly in the approprate place. | |
| 1866 g_browser_process->notification_ui_manager(); | |
| 1867 | |
| 1863 if (parameters().ui_task) { | 1868 if (parameters().ui_task) { |
| 1864 // We are in test mode. Run one task and enter the main message loop. | 1869 // We are in test mode. Run one task and enter the main message loop. |
| 1865 #if defined(OS_MACOSX) | 1870 #if defined(OS_MACOSX) |
| 1866 if (parameters().autorelease_pool) | 1871 if (parameters().autorelease_pool) |
| 1867 parameters().autorelease_pool->Recycle(); | 1872 parameters().autorelease_pool->Recycle(); |
| 1868 #endif | 1873 #endif |
| 1869 parameters().ui_task->Run(); | 1874 parameters().ui_task->Run(); |
| 1870 delete parameters().ui_task; | 1875 delete parameters().ui_task; |
| 1871 run_message_loop_ = false; | 1876 run_message_loop_ = false; |
| 1872 } else { | 1877 } else { |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2090 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && | 2095 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && |
| 2091 (pre_read == "0" || pre_read == "1")) { | 2096 (pre_read == "0" || pre_read == "1")) { |
| 2092 std::string uma_name(name); | 2097 std::string uma_name(name); |
| 2093 uma_name += "_PreRead"; | 2098 uma_name += "_PreRead"; |
| 2094 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 2099 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
| 2095 AddPreReadHistogramTime(uma_name.c_str(), time); | 2100 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 2096 } | 2101 } |
| 2097 #endif | 2102 #endif |
| 2098 #endif | 2103 #endif |
| 2099 } | 2104 } |
| OLD | NEW |