diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-13 03:26:13 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-13 03:26:13 +0000 |
| commit | 15be81387f3ab40242d28f3ee53adc3d6a1fac1c (patch) | |
| tree | 85ec956d20e07971d630aa1920eacdf73401347b /chrome/browser/task_manager_resource_providers.cc | |
| parent | 969a7b97029963ba6c6dd1456132d844160b5ad0 (diff) | |
| download | chromium_src-15be81387f3ab40242d28f3ee53adc3d6a1fac1c.zip chromium_src-15be81387f3ab40242d28f3ee53adc3d6a1fac1c.tar.gz chromium_src-15be81387f3ab40242d28f3ee53adc3d6a1fac1c.tar.bz2 | |
Mac: Add favicons to task manager.
Pull NSImage cache out of search engine dialog into its own class, reuse that.
Implement browser icon code in task_manager_resource_provider's browser resource provider.
BUG=13156
TEST=Open task manager. You should see icons. Open search engine manager, should still show icons.
Review URL: http://codereview.chromium.org/549021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_resource_providers.cc')
| -rw-r--r-- | chrome/browser/task_manager_resource_providers.cc | 10 |
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(); |