| 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/browser_main.h" | 5 #include "chrome/browser/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 1726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1737 // also be terminated when this scope exits. | 1737 // also be terminated when this scope exits. |
| 1738 scoped_ptr<browser::OomPriorityManager> oom_priority_manager( | 1738 scoped_ptr<browser::OomPriorityManager> oom_priority_manager( |
| 1739 new browser::OomPriorityManager); | 1739 new browser::OomPriorityManager); |
| 1740 #endif | 1740 #endif |
| 1741 | 1741 |
| 1742 // Create the instance of the cloud print proxy service so that it can launch | 1742 // Create the instance of the cloud print proxy service so that it can launch |
| 1743 // the service process if needed. This is needed because the service process | 1743 // the service process if needed. This is needed because the service process |
| 1744 // might have shutdown because an update was available. | 1744 // might have shutdown because an update was available. |
| 1745 profile->GetCloudPrintProxyService(); | 1745 profile->GetCloudPrintProxyService(); |
| 1746 | 1746 |
| 1747 // Need to initialize GpuDataManager to load the current GPU blacklist | 1747 // Need to initialize GpuDataManager to load the current GPU blacklist, |
| 1748 // and schedule a GPU blacklist auto update. | 1748 // collect preliminary GPU info, run through GPU blacklist, and schedule |
| 1749 // a GPU blacklist auto update. |
| 1749 GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance(); | 1750 GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance(); |
| 1750 DCHECK(gpu_data_manager); | 1751 DCHECK(gpu_data_manager); |
| 1751 | 1752 |
| 1752 // Start watching all browser threads for responsiveness. | 1753 // Start watching all browser threads for responsiveness. |
| 1753 ThreadWatcherList::StartWatchingAll(); | 1754 ThreadWatcherList::StartWatchingAll(); |
| 1754 | 1755 |
| 1755 int result_code = ResultCodes::NORMAL_EXIT; | 1756 int result_code = ResultCodes::NORMAL_EXIT; |
| 1756 if (parameters.ui_task) { | 1757 if (parameters.ui_task) { |
| 1757 // We are in test mode. Run one task and enter the main message loop. | 1758 // We are in test mode. Run one task and enter the main message loop. |
| 1758 if (pool) | 1759 if (pool) |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1851 #if defined(OS_CHROMEOS) | 1852 #if defined(OS_CHROMEOS) |
| 1852 // To be precise, logout (browser shutdown) is not yet done, but the | 1853 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1853 // remaining work is negligible, hence we say LogoutDone here. | 1854 // remaining work is negligible, hence we say LogoutDone here. |
| 1854 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1855 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1855 false); | 1856 false); |
| 1856 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1857 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1857 #endif | 1858 #endif |
| 1858 TRACE_EVENT_END("BrowserMain", 0, 0); | 1859 TRACE_EVENT_END("BrowserMain", 0, 0); |
| 1859 return result_code; | 1860 return result_code; |
| 1860 } | 1861 } |
| OLD | NEW |