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

Unified Diff: chrome/browser/task_manager/browser_process_resource_provider.cc

Issue 190533009: mac: Let task manager use IDR_PRODUCT_LOGO_16 instead of NSApplicationIcon. (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
« no previous file with comments | « no previous file | ui/gfx/image/image_skia_util_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/browser_process_resource_provider.cc
diff --git a/chrome/browser/task_manager/browser_process_resource_provider.cc b/chrome/browser/task_manager/browser_process_resource_provider.cc
index 3cc7bce5d1b554c2c2cb08cd391d2964da0015a0..a4bfa4e47084d852ec2c6cf3d2d83b2dae483ecb 100644
--- a/chrome/browser/task_manager/browser_process_resource_provider.cc
+++ b/chrome/browser/task_manager/browser_process_resource_provider.cc
@@ -43,19 +43,11 @@ BrowserProcessResource::BrowserProcessResource()
default_icon_ = new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f));
}
}
-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
+#elif defined(OS_POSIX)
if (!default_icon_) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
default_icon_ = rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_16);
}
-#elif defined(OS_MACOSX)
- if (!default_icon_) {
- // IDR_PRODUCT_LOGO_16 doesn't quite look like chrome/mac's icns icon. Load
- // the real app icon (requires a nsimage->image_skia->nsimage
- // conversion :-().
- default_icon_ = new gfx::ImageSkia(gfx::ApplicationIconAtSize(16));
- }
-#else
// TODO(port): Port icon code.
NOTIMPLEMENTED();
#endif // defined(OS_WIN)
« no previous file with comments | « no previous file | ui/gfx/image/image_skia_util_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698