summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/omnibox/omnibox_edit_controller.h
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 04:43:55 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 04:43:55 +0000
commit9b125b733b189fd8ba095b974b1eb3d12fee48ea (patch)
tree9f91ecff392641054ddce55c8b0d0cbfde2cfe60 /chrome/browser/ui/omnibox/omnibox_edit_controller.h
parent4be606f864a0e38682df6ad986d9c0fa6fb4e2a9 (diff)
downloadchromium_src-9b125b733b189fd8ba095b974b1eb3d12fee48ea.zip
chromium_src-9b125b733b189fd8ba095b974b1eb3d12fee48ea.tar.gz
chromium_src-9b125b733b189fd8ba095b974b1eb3d12fee48ea.tar.bz2
Convert mostly favicon related code from SkBitmap to ImageSkia and Image.
BUG=None Test=Compiles Review URL: https://chromiumcodereview.appspot.com/10834368 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/omnibox_edit_controller.h')
-rw-r--r--chrome/browser/ui/omnibox/omnibox_edit_controller.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_controller.h b/chrome/browser/ui/omnibox/omnibox_edit_controller.h
index fecf312..f6dac47 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_controller.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_controller.h
@@ -11,9 +11,12 @@
class GURL;
class InstantController;
-class SkBitmap;
class TabContents;
+namespace gfx {
+class Image;
+}
+
// I am in hack-and-slash mode right now.
// http://code.google.com/p/chromium/issues/detail?id=6772
@@ -52,7 +55,7 @@ class OmniboxEditController {
virtual void OnSetFocus() = 0;
// Returns the favicon of the current page.
- virtual SkBitmap GetFavicon() const = 0;
+ virtual gfx::Image GetFavicon() const = 0;
// Returns the title of the current page.
virtual string16 GetTitle() const = 0;