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_icon_manager_unittest.cc | |
| 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_icon_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_icon_manager_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index d0401c9..5fb32d7 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -76,9 +76,10 @@ class TestIconManager : public ExtensionIconManager { // Implements the ImageLoadingTracker::Observer interface, and calls through // to the base class' implementation. Then it lets the test know that an // image load was observed. - virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource, - int index) { - ExtensionIconManager::OnImageLoaded(image, resource, index); + virtual void OnImageLoaded(const gfx::Image& image, + const std::string& extension_id, + int index) OVERRIDE { + ExtensionIconManager::OnImageLoaded(image, extension_id, index); test_->ImageLoadObserved(); } |