Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1606)

Unified Diff: chrome/browser/extensions/image_loader.cc

Issue 216513002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/image_loader.cc
diff --git a/chrome/browser/extensions/image_loader.cc b/chrome/browser/extensions/image_loader.cc
index c6c732e74691e1d3e6c446594af9e86a800e6187..8c39052799978127389f8e5f16dee7275f9625e3 100644
--- a/chrome/browser/extensions/image_loader.cc
+++ b/chrome/browser/extensions/image_loader.cc
@@ -71,7 +71,7 @@ SkBitmap ResizeIfNeeded(const SkBitmap& bitmap,
}
void LoadResourceOnUIThread(int resource_id, SkBitmap* bitmap) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
gfx::ImageSkia image(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id));
@@ -320,7 +320,7 @@ void ImageLoader::LoadImagesAsync(
const Extension* extension,
const std::vector<ImageRepresentation>& info_list,
const ImageLoaderImageCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
base::PostTaskAndReplyWithResult(
BrowserThread::GetBlockingPool(),
@@ -336,7 +336,7 @@ void ImageLoader::LoadImageFamilyAsync(
const extensions::Extension* extension,
const std::vector<ImageRepresentation>& info_list,
const ImageLoaderImageFamilyCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
base::PostTaskAndReplyWithResult(
BrowserThread::GetBlockingPool(),
@@ -351,7 +351,7 @@ void ImageLoader::LoadImageFamilyAsync(
void ImageLoader::ReplyBack(const ImageLoaderImageCallback& callback,
const std::vector<LoadResult>& load_result) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
gfx::ImageSkia image_skia;
@@ -377,7 +377,7 @@ void ImageLoader::ReplyBack(const ImageLoaderImageCallback& callback,
void ImageLoader::ReplyBackWithImageFamily(
const ImageLoaderImageFamilyCallback& callback,
const std::vector<LoadResult>& load_result) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::map<std::pair<int, int>, gfx::ImageSkia> image_skia_map;
gfx::ImageFamily image_family;
« no previous file with comments | « chrome/browser/extensions/extension_warning_set.cc ('k') | chrome/browser/extensions/requirements_checker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698