summaryrefslogtreecommitdiffstats
path: root/chrome/browser/upgrade_detector.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 11:55:26 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 11:55:26 +0000
commit0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37 (patch)
treeb6803b94d704e6986642e36da11532eecffceb9d /chrome/browser/upgrade_detector.cc
parenta2e6df2c24bd6ecfcd95a0cda680a27a3403bec7 (diff)
downloadchromium_src-0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37.zip
chromium_src-0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37.tar.gz
chromium_src-0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37.tar.bz2
Rename ChromeThread to BrowserThread Part16:
- Rename entries starting from shell_integration.cc. More 30 files covered. BUG=56926 TEST=trybots Review URL: http://codereview.chromium.org/3708001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/upgrade_detector.cc')
-rw-r--r--chrome/browser/upgrade_detector.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index f19a6f6..d09896a 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -63,11 +63,11 @@ const int kNotifyUserAfterMs = 0;
// because we don't want to block the UI thread while launching a background
// process and reading its output; on the Mac, checking for an upgrade
// requires reading a file.
-const ChromeThread::ID kDetectUpgradeTaskID =
+const BrowserThread::ID kDetectUpgradeTaskID =
#if defined(OS_POSIX)
- ChromeThread::FILE;
+ BrowserThread::FILE;
#else
- ChromeThread::UI;
+ BrowserThread::UI;
#endif
// This task checks the currently running version of Chrome against the
@@ -82,13 +82,13 @@ class DetectUpgradeTask : public Task {
virtual ~DetectUpgradeTask() {
if (upgrade_detected_task_) {
// This has to get deleted on the same thread it was created.
- ChromeThread::PostTask(ChromeThread::UI, FROM_HERE,
- new DeleteTask<Task>(upgrade_detected_task_));
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ new DeleteTask<Task>(upgrade_detected_task_));
}
}
virtual void Run() {
- DCHECK(ChromeThread::CurrentlyOn(kDetectUpgradeTaskID));
+ DCHECK(BrowserThread::CurrentlyOn(kDetectUpgradeTaskID));
using installer::Version;
scoped_ptr<Version> installed_version;
@@ -137,8 +137,8 @@ class DetectUpgradeTask : public Task {
// restart in this case as well. See http://crbug.com/46547
if (!installed_version.get() ||
installed_version->IsHigherThan(running_version.get())) {
- ChromeThread::PostTask(ChromeThread::UI, FROM_HERE,
- upgrade_detected_task_);
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ upgrade_detected_task_);
upgrade_detected_task_ = NULL;
}
}
@@ -179,12 +179,12 @@ void UpgradeDetector::CheckForUpgrade() {
method_factory_.RevokeAll();
Task* callback_task =
method_factory_.NewRunnableMethod(&UpgradeDetector::UpgradeDetected);
- ChromeThread::PostTask(kDetectUpgradeTaskID, FROM_HERE,
- new DetectUpgradeTask(callback_task));
+ BrowserThread::PostTask(kDetectUpgradeTaskID, FROM_HERE,
+ new DetectUpgradeTask(callback_task));
}
void UpgradeDetector::UpgradeDetected() {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Stop the recurring timer (that is checking for changes).
detect_upgrade_timer_.Stop();