Remove AppDelegate::GetAppDefaultIcon

extensions/browser/app_window/app_window.cc

 // Copyright 2014 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 "extensions/browser/app_window/app_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/suggest_permission_util.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/draggable_region.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
+#include "extensions/grit/extensions_browser_resources.h"

[tapted, 2014/09/22 00:02:05]

I wonder if we should remove the `browser` bit..

 #include "third_party/skia/include/core/SkRegion.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 
 #if !defined(OS_MACOSX)
 #include "base/prefs/pref_service.h"
 #include "extensions/browser/pref_names.h"
 #endif
 
 using content::BrowserContext;
 using content::ConsoleMessageLevel;
 using content::WebContents;
@@ skipping 739 matching lines @@
 }
 
 void AppWindow::UpdateExtensionAppIcon() {
   // Avoid using any previous app icons were being downloaded.
   image_loader_ptr_factory_.InvalidateWeakPtrs();
 
   const Extension* extension = GetExtension();
   if (!extension)
     return;
 
+  gfx::ImageSkia app_default_icon =
+      *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_APP_DEFAULT_ICON);
+
   app_icon_image_.reset(new IconImage(browser_context(),
                                       extension,
                                       IconsInfo::GetIcons(extension),
                                       app_delegate_->PreferredIconSize(),
-                                      app_delegate_->GetAppDefaultIcon(),
+                                      app_default_icon,
                                       this));
 
   // Triggers actual image loading with 1x resources. The 2x resource will
   // be handled by IconImage class when requested.
   app_icon_image_->image_skia().GetRepresentation(1.0f);
 }
 
 void AppWindow::SetNativeWindowFullscreen() {
   native_app_window_->SetFullscreen(fullscreen_types_);
 
@@ skipping 249 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace extensions