| 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 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1742 bool record_search_engine = is_first_run && !profile->IsOffTheRecord(); | 1742 bool record_search_engine = is_first_run && !profile->IsOffTheRecord(); |
| 1743 #endif | 1743 #endif |
| 1744 | 1744 |
| 1745 // ChildProcess:: is a misnomer unless you consider context. Use | 1745 // ChildProcess:: is a misnomer unless you consider context. Use |
| 1746 // of --wait-for-debugger only makes sense when Chrome itself is a | 1746 // of --wait-for-debugger only makes sense when Chrome itself is a |
| 1747 // child process (e.g. when launched by PyAuto). | 1747 // child process (e.g. when launched by PyAuto). |
| 1748 if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) { | 1748 if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) { |
| 1749 ChildProcess::WaitForDebugger("Browser"); | 1749 ChildProcess::WaitForDebugger("Browser"); |
| 1750 } | 1750 } |
| 1751 | 1751 |
| 1752 // If remoting or cloud print proxy is enabled and setup has been completed | |
| 1753 // we start the service process here. | |
| 1754 // The prerequisite for running the service process is that we have IO, UI | |
| 1755 // and PROCESS_LAUNCHER threads up and running. | |
| 1756 // TODO(hclam): Need to check for cloud print proxy too. | |
| 1757 if (parsed_command_line.HasSwitch(switches::kEnableRemoting)) { | |
| 1758 if (user_prefs->GetBoolean(prefs::kRemotingHasSetupCompleted)) { | |
| 1759 ServiceProcessControl* control = | |
| 1760 ServiceProcessControlManager::GetInstance()->GetProcessControl( | |
| 1761 profile); | |
| 1762 control->Launch(NULL, NULL); | |
| 1763 } | |
| 1764 } | |
| 1765 | |
| 1766 #if defined(OS_CHROMEOS) | 1752 #if defined(OS_CHROMEOS) |
| 1767 // Run the Out of Memory priority manager while in this scope. Wait | 1753 // Run the Out of Memory priority manager while in this scope. Wait |
| 1768 // until here to start so that we give the most amount of time for | 1754 // until here to start so that we give the most amount of time for |
| 1769 // the other services to start up before we start adjusting the oom | 1755 // the other services to start up before we start adjusting the oom |
| 1770 // priority. In reality, it doesn't matter much where in this scope | 1756 // priority. In reality, it doesn't matter much where in this scope |
| 1771 // this is started, but it must be started in this scope so it will | 1757 // this is started, but it must be started in this scope so it will |
| 1772 // also be terminated when this scope exits. | 1758 // also be terminated when this scope exits. |
| 1773 scoped_ptr<browser::OomPriorityManager> oom_priority_manager( | 1759 scoped_ptr<browser::OomPriorityManager> oom_priority_manager( |
| 1774 new browser::OomPriorityManager); | 1760 new browser::OomPriorityManager); |
| 1775 #endif | 1761 #endif |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1898 #if defined(OS_CHROMEOS) | 1884 #if defined(OS_CHROMEOS) |
| 1899 // To be precise, logout (browser shutdown) is not yet done, but the | 1885 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1900 // remaining work is negligible, hence we say LogoutDone here. | 1886 // remaining work is negligible, hence we say LogoutDone here. |
| 1901 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1887 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1902 false); | 1888 false); |
| 1903 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1889 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1904 #endif | 1890 #endif |
| 1905 TRACE_EVENT_END("BrowserMain", 0, 0); | 1891 TRACE_EVENT_END("BrowserMain", 0, 0); |
| 1906 return result_code; | 1892 return result_code; |
| 1907 } | 1893 } |
| OLD | NEW |