Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 10834368: Convert mostly favicon related code from SkBitmap to ImageSkia and Image (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/gtk/location_bar_view_gtk.cc ('K') | « chrome/browser/ui/views/location_bar/action_box_button_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index b72e269391f08de2f00d6e60e75365259249cb7a..eedea53dd7f3cb8a4333254ee6d3a5483039ae32 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -286,7 +286,7 @@ class LocationBarView : public LocationBar,
virtual void OnInputInProgress(bool in_progress) OVERRIDE;
virtual void OnKillFocus() OVERRIDE;
virtual void OnSetFocus() OVERRIDE;
- virtual SkBitmap GetFavicon() const OVERRIDE;
+ virtual gfx::Image GetFavicon() const OVERRIDE;
virtual string16 GetTitle() const OVERRIDE;
virtual InstantController* GetInstant() OVERRIDE;
virtual TabContents* GetTabContents() const OVERRIDE;
« chrome/browser/ui/gtk/location_bar_view_gtk.cc ('K') | « chrome/browser/ui/views/location_bar/action_box_button_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698