mac: Let task manager use IDR_PRODUCT_LOGO_16 instead of NSApplicationIcon.

chrome/browser/task_manager/browser_process_resource_provider.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/browser_process_resource_provider.h"
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/task_manager/resource_provider.h"
 #include "chrome/browser/task_manager/task_manager.h"
@@ skipping 25 matching lines @@
   bool success = base::OpenPrivilegedProcessHandle(pid, &process_);
   DCHECK(success);
 #if defined(OS_WIN)
   if (!default_icon_) {
     HICON icon = GetAppIcon();
     if (icon) {
       scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
       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)
   default_icon_->MakeThreadSafe();
 }
 
 BrowserProcessResource::~BrowserProcessResource() {
   base::CloseProcessHandle(process_);
 }
 
@@ skipping 84 matching lines @@
 }
 
 void BrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void BrowserProcessResourceProvider::StopUpdating() {
 }
 
 }  // namespace task_manager