diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 19:58:06 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 19:58:06 +0000 |
| commit | bdd6eec2dbd37b2fdc38d32cd69f467bbc2d69cc (patch) | |
| tree | e99d5669185f6ac8ccd441baa70b69a65a0331c2 /chrome/browser/extensions/extension_install_ui.h | |
| parent | 04f050b37f95b156b4b60c9e05e5672bc3388f0f (diff) | |
| download | chromium_src-bdd6eec2dbd37b2fdc38d32cd69f467bbc2d69cc.zip chromium_src-bdd6eec2dbd37b2fdc38d32cd69f467bbc2d69cc.tar.gz chromium_src-bdd6eec2dbd37b2fdc38d32cd69f467bbc2d69cc.tar.bz2 | |
Add support for multiple icon sizes for Mac platform apps
This is the combined version of the following CLs:
http://codereview.chromium.org/9428025/
http://codereview.chromium.org/9500007/
http://codereview.chromium.org/9535002/
BUG=112651
TEST=
Review URL: https://chromiumcodereview.appspot.com/9586018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_install_ui.h')
| -rw-r--r-- | chrome/browser/extensions/extension_install_ui.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h index bb3ad1d..9a35da0 100644 --- a/chrome/browser/extensions/extension_install_ui.h +++ b/chrome/browser/extensions/extension_install_ui.h @@ -174,8 +174,9 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer { virtual void OnInstallFailure(const string16& error); // ImageLoadingTracker::Observer: - virtual void OnImageLoaded( - SkBitmap* image, const ExtensionResource& resource, int index) OVERRIDE; + virtual void OnImageLoaded(const gfx::Image& image, + const std::string& extension_id, + int index) OVERRIDE; // Opens a new tab page and animates the app icon for the app with id // |app_id|. @@ -201,7 +202,7 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer { // Sets the icon that will be used in any UI. If |icon| is NULL, or contains // an empty bitmap, then a default icon will be used instead. - void SetIcon(SkBitmap* icon); + void SetIcon(const SkBitmap* icon); // Starts the process of showing a confirmation UI, which is split into two. // 1) Set off a 'load icon' task. |