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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 #include "chrome/browser/chromeos/cros/screen_lock_library.h" | 139 #include "chrome/browser/chromeos/cros/screen_lock_library.h" |
140 #include "chrome/browser/chromeos/customization_document.h" | 140 #include "chrome/browser/chromeos/customization_document.h" |
141 #include "chrome/browser/chromeos/external_metrics.h" | 141 #include "chrome/browser/chromeos/external_metrics.h" |
142 #include "chrome/browser/chromeos/login/authenticator.h" | 142 #include "chrome/browser/chromeos/login/authenticator.h" |
143 #include "chrome/browser/chromeos/login/login_utils.h" | 143 #include "chrome/browser/chromeos/login/login_utils.h" |
144 #include "chrome/browser/chromeos/login/ownership_service.h" | 144 #include "chrome/browser/chromeos/login/ownership_service.h" |
145 #include "chrome/browser/chromeos/login/screen_locker.h" | 145 #include "chrome/browser/chromeos/login/screen_locker.h" |
146 #include "chrome/browser/chromeos/login/user_manager.h" | 146 #include "chrome/browser/chromeos/login/user_manager.h" |
147 #include "chrome/browser/chromeos/metrics_cros_settings_provider.h" | 147 #include "chrome/browser/chromeos/metrics_cros_settings_provider.h" |
148 #include "chrome/browser/chromeos/system_key_event_listener.h" | 148 #include "chrome/browser/chromeos/system_key_event_listener.h" |
| 149 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" |
149 #include "chrome/browser/oom_priority_manager.h" | 150 #include "chrome/browser/oom_priority_manager.h" |
150 #include "chrome/browser/ui/views/browser_dialogs.h" | 151 #include "chrome/browser/ui/views/browser_dialogs.h" |
151 #endif | 152 #endif |
152 | 153 |
153 // TODO(port): several win-only methods have been pulled out of this, but | 154 // TODO(port): several win-only methods have been pulled out of this, but |
154 // BrowserMain() as a whole needs to be broken apart so that it's usable by | 155 // BrowserMain() as a whole needs to be broken apart so that it's usable by |
155 // other platforms. For now, it's just a stub. This is a serious work in | 156 // other platforms. For now, it's just a stub. This is a serious work in |
156 // progress and should not be taken as an indication of a real refactoring. | 157 // progress and should not be taken as an indication of a real refactoring. |
157 | 158 |
158 #if defined(OS_WIN) | 159 #if defined(OS_WIN) |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
653 | 654 |
654 // Creates key child threads. We need to do this explicitly since | 655 // Creates key child threads. We need to do this explicitly since |
655 // BrowserThread::PostTask silently deletes a posted task if the target message | 656 // BrowserThread::PostTask silently deletes a posted task if the target message |
656 // loop isn't created. | 657 // loop isn't created. |
657 void CreateChildThreads(BrowserProcessImpl* process) { | 658 void CreateChildThreads(BrowserProcessImpl* process) { |
658 process->db_thread(); | 659 process->db_thread(); |
659 process->file_thread(); | 660 process->file_thread(); |
660 process->process_launcher_thread(); | 661 process->process_launcher_thread(); |
661 process->cache_thread(); | 662 process->cache_thread(); |
662 process->io_thread(); | 663 process->io_thread(); |
| 664 #if defined(OS_CHROMEOS) |
| 665 process->web_socket_proxy_thread(); |
| 666 #endif |
663 // Create watchdog thread after creating all other threads because it will | 667 // Create watchdog thread after creating all other threads because it will |
664 // watch the other threads and they must be running. | 668 // watch the other threads and they must be running. |
665 process->watchdog_thread(); | 669 process->watchdog_thread(); |
666 } | 670 } |
667 | 671 |
668 // Returns the new local state object, guaranteed non-NULL. | 672 // Returns the new local state object, guaranteed non-NULL. |
669 PrefService* InitializeLocalState(const CommandLine& parsed_command_line, | 673 PrefService* InitializeLocalState(const CommandLine& parsed_command_line, |
670 bool is_first_run) { | 674 bool is_first_run) { |
671 FilePath local_state_path; | 675 FilePath local_state_path; |
672 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); | 676 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); |
(...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1940 #if defined(OS_CHROMEOS) | 1944 #if defined(OS_CHROMEOS) |
1941 // To be precise, logout (browser shutdown) is not yet done, but the | 1945 // To be precise, logout (browser shutdown) is not yet done, but the |
1942 // remaining work is negligible, hence we say LogoutDone here. | 1946 // remaining work is negligible, hence we say LogoutDone here. |
1943 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1947 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
1944 false); | 1948 false); |
1945 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1949 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
1946 #endif | 1950 #endif |
1947 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 1951 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
1948 return result_code; | 1952 return result_code; |
1949 } | 1953 } |
OLD | NEW |