From 67e59fcdb660aef5c860f4a917f9bf4171ef4793 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 7 Oct 2010 02:42:13 +0000 Subject: Rename ChromeThread to BrowserThread Part3: - Rename entries under task_manager, themes, views, web_applications, web_resource, webdata and worker_host. BUG=56926 TEST=trybots Review URL: http://codereview.chromium.org/3579014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61756 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/themes/browser_theme_pack.cc | 10 +++++----- chrome/browser/themes/browser_theme_pack_unittest.cc | 8 ++++---- chrome/browser/themes/browser_theme_provider.cc | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'chrome/browser/themes') diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 2197fd2..e48f579 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -327,7 +327,7 @@ BrowserThemePack::~BrowserThemePack() { // static BrowserThemePack* BrowserThemePack::BuildFromExtension(Extension* extension) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(extension); DCHECK(extension->is_theme()); @@ -366,7 +366,7 @@ BrowserThemePack* BrowserThemePack::BuildFromExtension(Extension* extension) { // static scoped_refptr BrowserThemePack::BuildFromDataPack( FilePath path, const std::string& expected_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); scoped_refptr pack = new BrowserThemePack; pack->data_pack_.reset(new base::DataPack); @@ -418,7 +418,7 @@ scoped_refptr BrowserThemePack::BuildFromDataPack( } bool BrowserThemePack::WriteToDisk(FilePath path) const { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); // Add resources for each of the property arrays. RawDataForWriting resources; resources[kHeaderID] = base::StringPiece( @@ -991,7 +991,7 @@ void BrowserThemePack::GenerateTabBackgroundImages(ImageCache* bitmaps) const { void BrowserThemePack::RepackImages(const ImageCache& images, RawImages* reencoded_images) const { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); for (ImageCache::const_iterator it = images.begin(); it != images.end(); ++it) { std::vector image_data; @@ -1019,7 +1019,7 @@ void BrowserThemePack::MergeImageCaches( void BrowserThemePack::AddRawImagesTo(const RawImages& images, RawDataForWriting* out) const { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); for (RawImages::const_iterator it = images.begin(); it != images.end(); ++it) { (*out)[it->first] = base::StringPiece( diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 9fae131..2ff05bd 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -22,8 +22,8 @@ class BrowserThemePackTest : public ::testing::Test { public: BrowserThemePackTest() : message_loop(), - fake_ui_thread(ChromeThread::UI, &message_loop), - fake_file_thread(ChromeThread::FILE, &message_loop), + fake_ui_thread(BrowserThread::UI, &message_loop), + fake_file_thread(BrowserThread::FILE, &message_loop), theme_pack_(new BrowserThemePack) { } @@ -191,8 +191,8 @@ class BrowserThemePackTest : public ::testing::Test { } MessageLoop message_loop; - ChromeThread fake_ui_thread; - ChromeThread fake_file_thread; + BrowserThread fake_ui_thread; + BrowserThread fake_file_thread; scoped_refptr theme_pack_; }; diff --git a/chrome/browser/themes/browser_theme_provider.cc b/chrome/browser/themes/browser_theme_provider.cc index 5f91370..8910637 100644 --- a/chrome/browser/themes/browser_theme_provider.cc +++ b/chrome/browser/themes/browser_theme_provider.cc @@ -610,8 +610,8 @@ void BrowserThemeProvider::BuildFromExtension(Extension* extension) { // Write the packed file to disk. FilePath pack_path = extension->path().Append(chrome::kThemePackFilename); - ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, - new WritePackToDiskTask(pack, pack_path)); + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, + new WritePackToDiskTask(pack, pack_path)); SavePackName(pack_path); theme_pack_ = pack; -- cgit v1.1