summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager_resource_providers.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/task_manager_resource_providers.cc')
-rw-r--r--chrome/browser/task_manager_resource_providers.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc
index 715dd08..57f6b7a 100644
--- a/chrome/browser/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager_resource_providers.cc
@@ -40,6 +40,10 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
+#if defined(OS_MACOSX)
+#include "skia/ext/skia_utils_mac.h"
+#endif
+
////////////////////////////////////////////////////////////////////////////////
// TaskManagerTabContentsResource class
////////////////////////////////////////////////////////////////////////////////
@@ -711,6 +715,12 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserProcessResource()
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
default_icon_ = rb.GetBitmapNamed(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->skbitmap->nsimage conversion :-().
+ default_icon_ = new SkBitmap(gfx::AppplicationIconAtSize(16));
+ }
#else
// TODO(port): Port icon code.
NOTIMPLEMENTED();