summaryrefslogtreecommitdiffstats
path: root/chrome/browser/policy/configuration_policy_loader_win.cc
diff options
context:
space:
mode:
authorjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 08:58:32 +0000
committerjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 08:58:32 +0000
commit096c751983b7077eda9848dc151261b800cfde45 (patch)
tree96f2e282b211f07b6c0a7ef9ce201d7952ba232c /chrome/browser/policy/configuration_policy_loader_win.cc
parent42c50aba03e59e0fdd60cd4a2f8c141a09406a93 (diff)
downloadchromium_src-096c751983b7077eda9848dc151261b800cfde45.zip
chromium_src-096c751983b7077eda9848dc151261b800cfde45.tar.gz
chromium_src-096c751983b7077eda9848dc151261b800cfde45.tar.bz2
Remove MessageLoop::DestructionObserver registration from ConfigurationPolicyLoaderWin
BUG=69193 TEST=No direct test; watch crash reports to see if the crash that's supposed to be fixed by this still occurs. Review URL: http://codereview.chromium.org/6316003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/configuration_policy_loader_win.cc')
-rw-r--r--chrome/browser/policy/configuration_policy_loader_win.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/policy/configuration_policy_loader_win.cc b/chrome/browser/policy/configuration_policy_loader_win.cc
index 68ccf80..7ad6863 100644
--- a/chrome/browser/policy/configuration_policy_loader_win.cc
+++ b/chrome/browser/policy/configuration_policy_loader_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -31,13 +31,11 @@ ConfigurationPolicyLoaderWin::ConfigurationPolicyLoaderWin(
void ConfigurationPolicyLoaderWin::InitOnFileThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
AsynchronousPolicyLoader::InitOnFileThread();
- MessageLoop::current()->AddDestructionObserver(this);
SetupWatches();
}
void ConfigurationPolicyLoaderWin::StopOnFileThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- MessageLoop::current()->RemoveDestructionObserver(this);
user_policy_watcher_.StopWatching();
machine_policy_watcher_.StopWatching();
AsynchronousPolicyLoader::StopOnFileThread();
@@ -81,10 +79,4 @@ void ConfigurationPolicyLoaderWin::OnObjectSignaled(HANDLE object) {
Reload();
}
-void ConfigurationPolicyLoaderWin::
- WillDestroyCurrentMessageLoop() {
- CancelReloadTask();
- MessageLoop::current()->RemoveDestructionObserver(this);
-}
-
} // namespace policy