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

Unified Diff: ui/base/resource/resource_bundle_mac.mm

Issue 7055010: Rename internal gfx::Image members to be less confusing with Cocoa types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac Created 9 years, 7 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
« no previous file with comments | « no previous file | ui/gfx/image.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_mac.mm
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index 0508177e090a0d7bddc14ff5b9bf36d8a016fb69..2c66d6088b7ce350974ddf09f4515c9c5f563971 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -71,7 +71,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
base::AutoLock lock(*lock_);
ImageMap::const_iterator found = images_.find(resource_id);
if (found != images_.end()) {
- if (!found->second->HasRepresentation(gfx::Image::kNSImageRep)) {
+ if (!found->second->HasRepresentation(gfx::Image::kImageRepCocoa)) {
DLOG(WARNING) << "ResourceBundle::GetNativeImageNamed() is returning a"
<< " cached gfx::Image that isn't backed by an NSImage. The image"
<< " will be converted, rather than going through the NSImage loader."
« no previous file with comments | « no previous file | ui/gfx/image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698