summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_applications
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/web_applications')
-rw-r--r--chrome/browser/web_applications/web_app.cc18
-rw-r--r--chrome/browser/web_applications/web_app_unittest.cc4
2 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 99e004b..6e4c0d3 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -259,7 +259,7 @@ void CreateShortcutTask::Run() {
}
bool CreateShortcutTask::CreateShortcut() {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
#if defined(OS_LINUX)
scoped_ptr<base::Environment> env(base::Environment::Create());
@@ -516,7 +516,7 @@ void UpdateShortcutWorker::Observe(NotificationType type,
void UpdateShortcutWorker::DownloadIcon() {
// FetchIcon must run on UI thread because it relies on TabContents
// to download the icon.
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (tab_contents_ == NULL) {
DeleteMe(); // We are done if underlying TabContents is gone.
@@ -557,7 +557,7 @@ void UpdateShortcutWorker::OnIconDownloaded(int download_id,
}
void UpdateShortcutWorker::CheckExistingShortcuts() {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
// Locations to check to shortcut_paths.
struct {
@@ -605,13 +605,13 @@ void UpdateShortcutWorker::CheckExistingShortcuts() {
}
void UpdateShortcutWorker::UpdateShortcuts() {
- ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE,
+ BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
NewRunnableMethod(this,
&UpdateShortcutWorker::UpdateShortcutsOnFileThread));
}
void UpdateShortcutWorker::UpdateShortcutsOnFileThread() {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
FilePath web_app_path = GetWebAppDataDirectory(
web_app::GetDataDir(profile_path_), shortcut_info_.url);
@@ -660,16 +660,16 @@ void UpdateShortcutWorker::OnShortcutsUpdated(bool) {
}
void UpdateShortcutWorker::DeleteMe() {
- if (ChromeThread::CurrentlyOn(ChromeThread::UI)) {
+ if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
DeleteMeOnUIThread();
} else {
- ChromeThread::PostTask(ChromeThread::UI, FROM_HERE,
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
NewRunnableMethod(this, &UpdateShortcutWorker::DeleteMeOnUIThread));
}
}
void UpdateShortcutWorker::DeleteMeOnUIThread() {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
delete this;
}
#endif // defined(OS_WIN)
@@ -696,7 +696,7 @@ void CreateShortcut(
const FilePath& data_dir,
const ShellIntegration::ShortcutInfo& shortcut_info,
CreateShortcutCallback* callback) {
- ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE,
+ BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
new CreateShortcutTask(data_dir, shortcut_info, callback));
}
diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc
index 33e42b8..1c88b6e 100644
--- a/chrome/browser/web_applications/web_app_unittest.cc
+++ b/chrome/browser/web_applications/web_app_unittest.cc
@@ -18,7 +18,7 @@ class WebApplicationTest : public RenderViewHostTestHarness {
public:
WebApplicationTest()
: RenderViewHostTestHarness(),
- ui_thread_(ChromeThread::UI, &message_loop_) {
+ ui_thread_(BrowserThread::UI, &message_loop_) {
}
private:
@@ -36,7 +36,7 @@ class WebApplicationTest : public RenderViewHostTestHarness {
profile_.reset(NULL);
}
- ChromeThread ui_thread_;
+ BrowserThread ui_thread_;
};
TEST_F(WebApplicationTest, GetShortcutInfoForTab) {