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

Unified Diff: chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.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/gtk/create_application_shortcuts_dialog_gtk.cc
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index 5c907b4e77d2ce4e229e07dc4792121433d4a183..95fb227c09c00f995b09906f4a02f5085e79d46b 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.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.
@@ -20,6 +20,7 @@
#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_resource.h"
#include "content/public/browser/browser_thread.h"
@@ -324,14 +325,14 @@ CreateChromeApplicationShortcutsDialogGtk::
// Get the icon.
const gfx::Size max_size(kIconPreviewSizePixels, kIconPreviewSizePixels);
- ExtensionResource icon_resource = app_->GetIconResource(
- kIconPreviewSizePixels, ExtensionIconSet::MATCH_BIGGER);
+ ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
+ app_, kIconPreviewSizePixels, ExtensionIconSet::MATCH_BIGGER);
// If no icon exists that is the desired size or larger, get the
// largest icon available:
if (icon_resource.empty())
- icon_resource = app_->GetIconResource(
- kIconPreviewSizePixels, ExtensionIconSet::MATCH_SMALLER);
+ icon_resource = extensions::IconsInfo::GetIconResource(
+ app_, kIconPreviewSizePixels, ExtensionIconSet::MATCH_SMALLER);
// Note that tracker_.LoadImage() can call OnImageLoaded() before it returns,
// if the image is cached. This is very rare. Do not do anything after

Powered by Google App Engine
This is Rietveld 408576698