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/shell_integration.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/shell_integration.h')
| -rw-r--r-- | chrome/browser/shell_integration.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index 21ee71f..8083b6a 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h @@ -14,6 +14,7 @@ #include "base/string16.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/image/image.h" class CommandLine; @@ -77,7 +78,7 @@ class ShellIntegration { string16 title; string16 description; FilePath extension_path; - SkBitmap favicon; + gfx::Image favicon; // Shortcuts to platform apps are created differently. They start up with // their own user data directory and load the app from |extension_path|. |