diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 19:48:58 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 19:48:58 +0000 |
| commit | de2658d5131e55239517f66c9ee19e3153941599 (patch) | |
| tree | 7a262c083c035746b2916c662762e3b2d16fb4f8 /chrome/browser/browser_main.cc | |
| parent | ed27fa208601080479f3ef4e85d48c80ec778f97 (diff) | |
| download | chromium_src-de2658d5131e55239517f66c9ee19e3153941599.zip chromium_src-de2658d5131e55239517f66c9ee19e3153941599.tar.gz chromium_src-de2658d5131e55239517f66c9ee19e3153941599.tar.bz2 | |
Removed the ServiceProcessType enum because a single service process should host all types of services. Also implemeneted a rudimentary singleton mechanism for the service process on Windows.
BUG=None
TEST=Test cloud print proxy and remoting UI.
Review URL: http://codereview.chromium.org/3521012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 1679475..a922f06 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -81,7 +81,6 @@ #include "chrome/common/net/net_resource_provider.h" #include "chrome/common/pref_names.h" #include "chrome/common/result_codes.h" -#include "chrome/common/service_process_type.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/master_preferences.h" #include "grit/app_locale_settings.h" @@ -1426,7 +1425,7 @@ int BrowserMain(const MainFunctionParams& parameters) { if (parsed_command_line.HasSwitch(switches::kEnableRemoting)) { if (user_prefs->GetBoolean(prefs::kRemotingHasSetupCompleted)) { ServiceProcessControl* control = ServiceProcessControlManager::instance() - ->GetProcessControl(profile, kServiceProcessRemoting); + ->GetProcessControl(profile); control->Launch(NULL); } } |