| Index: chrome/browser/extensions/extension_install_prompt.cc
|
| diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
|
| index 77915bdefc59d53951eea930eae00f0d07858750..28fb962ab4bd5b6e53fe059bc3c4a5a6f2df23e9 100644
|
| --- a/chrome/browser/extensions/extension_install_prompt.cc
|
| +++ b/chrome/browser/extensions/extension_install_prompt.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.
|
|
|
| @@ -23,6 +23,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/common/chrome_switches.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"
|
| @@ -113,7 +114,7 @@ int GetSizeForMaxScaleFactor(int size_in_dip) {
|
| // Returns bitmap for the default icon with size equal to the default icon's
|
| // pixel size under maximal supported scale factor.
|
| SkBitmap GetDefaultIconBitmapForMaxScaleFactor(bool is_app) {
|
| - return Extension::GetDefaultIcon(is_app).
|
| + return extensions::IconsInfo::GetDefaultIcon(is_app).
|
| GetRepresentation(ui::GetMaxScaleFactor()).sk_bitmap();
|
| }
|
|
|
| @@ -569,9 +570,10 @@ void ExtensionInstallPrompt::LoadImageIfNeeded() {
|
| }
|
|
|
| // Load the image asynchronously. For the response, check OnImageLoaded.
|
| - ExtensionResource image =
|
| - extension_->GetIconResource(extension_misc::EXTENSION_ICON_LARGE,
|
| - ExtensionIconSet::MATCH_BIGGER);
|
| + ExtensionResource image = extensions::IconsInfo::GetIconResource(
|
| + extension_,
|
| + extension_misc::EXTENSION_ICON_LARGE,
|
| + ExtensionIconSet::MATCH_BIGGER);
|
| // Load the icon whose pixel size is large enough to be displayed under
|
| // maximal supported scale factor. UI code will scale the icon down if needed.
|
| // TODO(tbarzic): We should use IconImage here and load the required bitmap
|
|
|