diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/metrics/thread_watcher.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/printing/print_job_worker.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/views/shell_dialogs_win.cc | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index 4252580..8d4fe59 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -630,8 +630,6 @@ WatchDogThread::WatchDogThread() : Thread("BrowserWatchdog") { } WatchDogThread::~WatchDogThread() { - // We cannot rely on our base class to stop the thread since we want our - // CleanUp function to run. Stop(); } diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 19e967b..1072fb5 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -68,6 +68,7 @@ PrintJobWorker::~PrintJobWorker() { // cancels printing or in the case of print preview, the worker is destroyed // on the I/O thread. DCHECK_EQ(owner_->message_loop(), MessageLoop::current()); + Stop(); } void PrintJobWorker::SetNewOwner(PrintJobWorkerOwner* new_owner) { diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc index faa4cb9..38f5158 100644 --- a/chrome/browser/ui/views/shell_dialogs_win.cc +++ b/chrome/browser/ui/views/shell_dialogs_win.cc @@ -383,6 +383,9 @@ bool SaveFileAs(HWND owner, class ShellDialogThread : public base::Thread { public: ShellDialogThread() : base::Thread("Chrome_ShellDialogThread") { } + ~ShellDialogThread() { + Stop(); + } protected: void Init() { |