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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: License year update Created 7 years, 11 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
Index: chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
index 49936957e174bbebbb79fc4938b408b59e582f17..fe1371667d2e054f2fe2a73a02a06019984a8e38 100644
--- a/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 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.
@@ -7,6 +7,7 @@
#include "base/stl_util.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -47,9 +48,9 @@ void LauncherAppIconLoader::FetchImage(const std::string& id) {
extensions::IconImage* image = new extensions::IconImage(
extension,
- extension->icons(),
+ IconsInfo::GetIcons(extension),
extension_misc::EXTENSION_ICON_SMALL,
- extensions::Extension::GetDefaultIcon(true),
+ extensions::IconsInfo::GetDefaultIcon(true), // is app
this);
// |map_| takes ownership of |image|.
map_[image] = id;

Powered by Google App Engine
This is Rietveld 408576698