diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 22:37:38 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 22:37:38 +0000 |
| commit | 17543d6da3e6078109e25358481fd3bbd98ab587 (patch) | |
| tree | 9d92d94d76db72a6feb4becc2e7f77ec89ebcf10 /chrome/browser/browser_main.cc | |
| parent | 4c974a138a20ec387ad0f347ca6d0804f26de74e (diff) | |
| download | chromium_src-17543d6da3e6078109e25358481fd3bbd98ab587.zip chromium_src-17543d6da3e6078109e25358481fd3bbd98ab587.tar.gz chromium_src-17543d6da3e6078109e25358481fd3bbd98ab587.tar.bz2 | |
All communication with the cloud print proxy service from the browser now happens in the CloudPrintProxyService class. Added code to start the service process if the cloud print proxy was enabled. Also, when detect an auto-update, we send an IPC to the service process. The service process then shuts down when the browser disconnects.
BUG=None
TEST=Unit-tests, test Cloud Print proxy UI, test that when an update is available, the service process shuts down when the browser does.
TBR=phajdan.jr
Review URL: http://codereview.chromium.org/3617008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 85d2c76..1e556d3 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -58,6 +58,7 @@ #include "chrome/browser/plugin_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_value_store.h" +#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" @@ -1440,6 +1441,11 @@ int BrowserMain(const MainFunctionParams& parameters) { } } + // Create the instance of the cloud print proxy service so that it can launch + // the service process if needed. This is needed because the service process + // might have shutdown because an update was available. + profile->GetCloudPrintProxyService(); + int result_code = ResultCodes::NORMAL_EXIT; if (parameters.ui_task) { // We are in test mode. Run one task and enter the main message loop. |