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

Unified Diff: chrome/browser/ui/views/infobars/extension_infobar.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/views/infobars/extension_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index 552d7949375918be590e79176f8c52f1bd4ca0ac..479b62ab12aa10bf106d53aa3a6929713f1f7be8 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.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.
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_infobar_delegate.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
@@ -132,8 +133,8 @@ void ExtensionInfoBar::ViewHierarchyChanged(bool is_add,
const extensions::Extension* extension = extension_host->extension();
extension_misc::ExtensionIcons image_size =
extension_misc::EXTENSION_ICON_BITTY;
- ExtensionResource icon_resource = extension->GetIconResource(
- image_size, ExtensionIconSet::MATCH_EXACTLY);
+ ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
+ extension, image_size, ExtensionIconSet::MATCH_EXACTLY);
tracker_.LoadImage(extension, icon_resource,
gfx::Size(image_size, image_size), ImageLoadingTracker::DONT_CACHE);
}

Powered by Google App Engine
This is Rietveld 408576698