| 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 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 } | 726 } |
| 727 | 727 |
| 728 // Creates key child threads. We need to do this explicitly since | 728 // Creates key child threads. We need to do this explicitly since |
| 729 // BrowserThread::PostTask silently deletes a posted task if the target message | 729 // BrowserThread::PostTask silently deletes a posted task if the target message |
| 730 // loop isn't created. | 730 // loop isn't created. |
| 731 void CreateChildThreads(BrowserProcessImpl* process) { | 731 void CreateChildThreads(BrowserProcessImpl* process) { |
| 732 process->db_thread(); | 732 process->db_thread(); |
| 733 process->file_thread(); | 733 process->file_thread(); |
| 734 process->process_launcher_thread(); | 734 process->process_launcher_thread(); |
| 735 process->cache_thread(); | 735 process->cache_thread(); |
| 736 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) || |
| 737 CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU)) |
| 738 process->gpu_thread(); |
| 736 process->io_thread(); | 739 process->io_thread(); |
| 737 #if defined(OS_CHROMEOS) | 740 #if defined(OS_CHROMEOS) |
| 738 process->web_socket_proxy_thread(); | 741 process->web_socket_proxy_thread(); |
| 739 #endif | 742 #endif |
| 740 // Create watchdog thread after creating all other threads because it will | 743 // Create watchdog thread after creating all other threads because it will |
| 741 // watch the other threads and they must be running. | 744 // watch the other threads and they must be running. |
| 742 process->watchdog_thread(); | 745 process->watchdog_thread(); |
| 743 } | 746 } |
| 744 | 747 |
| 745 // Returns the new local state object, guaranteed non-NULL. | 748 // Returns the new local state object, guaranteed non-NULL. |
| (...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1949 #if defined(OS_CHROMEOS) | 1952 #if defined(OS_CHROMEOS) |
| 1950 // To be precise, logout (browser shutdown) is not yet done, but the | 1953 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1951 // remaining work is negligible, hence we say LogoutDone here. | 1954 // remaining work is negligible, hence we say LogoutDone here. |
| 1952 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1955 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1953 false); | 1956 false); |
| 1954 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1957 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1955 #endif | 1958 #endif |
| 1956 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 1959 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
| 1957 return result_code; | 1960 return result_code; |
| 1958 } | 1961 } |
| OLD | NEW |