diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:26:14 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:26:14 +0000 |
| commit | 3222c3267f36014363d5414f8e927b7f7eb8be47 (patch) | |
| tree | 84ca5e6fe17df65d1d0be76655c3e78286740302 /chrome/browser/browser_process_impl.cc | |
| parent | f063641309a6d9e1b0b2fb751db356aac91b8a78 (diff) | |
| download | chromium_src-3222c3267f36014363d5414f8e927b7f7eb8be47.zip chromium_src-3222c3267f36014363d5414f8e927b7f7eb8be47.tar.gz chromium_src-3222c3267f36014363d5414f8e927b7f7eb8be47.tar.bz2 | |
Don't delete PrintJobManager from ReleaseModule(), just Shutdown.
Separated PrintJobManager parts accessible from non-UI threads.
BUG=6828, 134906
Review URL: https://chromiumcodereview.appspot.com/23653033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index bd3d3e1..a48c7e2 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -338,8 +338,7 @@ unsigned int BrowserProcessImpl::ReleaseModule() { // Wait for the pending print jobs to finish. Don't do this later, since // this might cause a nested message loop to run, and we don't want pending // tasks to run once teardown has started. - print_job_manager_->OnQuit(); - print_job_manager_.reset(); + print_job_manager_->Shutdown(); #endif CHECK(base::MessageLoop::current()->is_running()); @@ -560,11 +559,7 @@ bool BrowserProcessImpl::IsShuttingDown() { } printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { - // TODO(abarth): DCHECK(CalledOnValidThread()); - // http://code.google.com/p/chromium/issues/detail?id=6828 - // print_job_manager_ is initialized in the constructor and destroyed in the - // destructor, so it should always be valid. - DCHECK(print_job_manager_.get()); + DCHECK(CalledOnValidThread()); return print_job_manager_.get(); } |