Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(934)

Side by Side Diff: chrome/browser/browser_main.cc

Issue 6955010: Remove the Remoting Host component from Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove an errant include. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1741 matching lines...) Expand 10 before | Expand all | Expand 10 after
1752 bool record_search_engine = is_first_run && !profile->IsOffTheRecord(); 1752 bool record_search_engine = is_first_run && !profile->IsOffTheRecord();
1753 #endif 1753 #endif
1754 1754
1755 // ChildProcess:: is a misnomer unless you consider context. Use 1755 // ChildProcess:: is a misnomer unless you consider context. Use
1756 // of --wait-for-debugger only makes sense when Chrome itself is a 1756 // of --wait-for-debugger only makes sense when Chrome itself is a
1757 // child process (e.g. when launched by PyAuto). 1757 // child process (e.g. when launched by PyAuto).
1758 if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) { 1758 if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) {
1759 ChildProcess::WaitForDebugger("Browser"); 1759 ChildProcess::WaitForDebugger("Browser");
1760 } 1760 }
1761 1761
1762 // If remoting or cloud print proxy is enabled and setup has been completed
1763 // we start the service process here.
1764 // The prerequisite for running the service process is that we have IO, UI
1765 // and PROCESS_LAUNCHER threads up and running.
1766 // TODO(hclam): Need to check for cloud print proxy too.
1767 if (parsed_command_line.HasSwitch(switches::kEnableRemoting)) {
1768 if (user_prefs->GetBoolean(prefs::kRemotingHasSetupCompleted)) {
1769 ServiceProcessControl* control =
1770 ServiceProcessControlManager::GetInstance()->GetProcessControl(
1771 profile);
1772 control->Launch(NULL, NULL);
1773 }
1774 }
1775
1776 #if defined(OS_CHROMEOS) 1762 #if defined(OS_CHROMEOS)
1777 // Run the Out of Memory priority manager while in this scope. Wait 1763 // Run the Out of Memory priority manager while in this scope. Wait
1778 // until here to start so that we give the most amount of time for 1764 // until here to start so that we give the most amount of time for
1779 // the other services to start up before we start adjusting the oom 1765 // the other services to start up before we start adjusting the oom
1780 // priority. In reality, it doesn't matter much where in this scope 1766 // priority. In reality, it doesn't matter much where in this scope
1781 // this is started, but it must be started in this scope so it will 1767 // this is started, but it must be started in this scope so it will
1782 // also be terminated when this scope exits. 1768 // also be terminated when this scope exits.
1783 scoped_ptr<browser::OomPriorityManager> oom_priority_manager( 1769 scoped_ptr<browser::OomPriorityManager> oom_priority_manager(
1784 new browser::OomPriorityManager); 1770 new browser::OomPriorityManager);
1785 #endif 1771 #endif
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1908 #if defined(OS_CHROMEOS) 1894 #if defined(OS_CHROMEOS)
1909 // To be precise, logout (browser shutdown) is not yet done, but the 1895 // To be precise, logout (browser shutdown) is not yet done, but the
1910 // remaining work is negligible, hence we say LogoutDone here. 1896 // remaining work is negligible, hence we say LogoutDone here.
1911 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1897 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1912 false); 1898 false);
1913 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1899 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1914 #endif 1900 #endif
1915 TRACE_EVENT_END("BrowserMain", 0, 0); 1901 TRACE_EVENT_END("BrowserMain", 0, 0);
1916 return result_code; 1902 return result_code;
1917 } 1903 }
OLDNEW
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698