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/printing | |
| 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/printing')
| -rw-r--r-- | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index 2dfc19f..c6e459a 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -34,7 +34,6 @@ #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" -#include "chrome/common/service_process_type.h" #include "gfx/font.h" #include "grit/locale_settings.h" @@ -93,9 +92,7 @@ class CloudPrintServiceDisableTask DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); process_control_ = - ServiceProcessControlManager::instance()->GetProcessControl( - profile_, - kServiceProcessCloudPrint); + ServiceProcessControlManager::instance()->GetProcessControl(profile_); if (process_control_) { // If the process isn't connected, launch it now. This will run @@ -145,9 +142,7 @@ class CloudPrintServiceRefreshTask DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); process_control_ = - ServiceProcessControlManager::instance()->GetProcessControl( - profile_, - kServiceProcessCloudPrint); + ServiceProcessControlManager::instance()->GetProcessControl(profile_); if (process_control_) { // If the process isn't connected, launch it now. This will run @@ -351,9 +346,7 @@ void CloudPrintSetupFlow::OnClientLoginSuccess( // If we have already connected to the service process then submit the tokens // to it to register the host. process_control_ = - ServiceProcessControlManager::instance()->GetProcessControl( - profile_, - kServiceProcessCloudPrint); + ServiceProcessControlManager::instance()->GetProcessControl(profile_); #if defined(OS_WIN) // TODO(hclam): This call only works on Windows. I need to make it |