chrome/browser/ui/omnibox/omnibox_edit_model.h - Issue 10834368: Convert mostly favicon related code from SkBitmap to ImageSkia and Image

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/omnibox/omnibox_edit_model.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/omnibox/omnibox_edit_controller.h ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/omnibox/omnibox_edit_model.h

diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h

index 4a02f331119d179bb2862990e3c5b33916800224..a2afe323c9bfb209fd7f0ff52b7109a28a128e90 100644

--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h

+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h

@@ -25,9 +25,9 @@ class OmniboxEditController;

class OmniboxPopupModel;

class OmniboxView;

class Profile;

-class SkBitmap;

namespace gfx {

+class Image;

class Rect;

}

@@ -80,7 +80,7 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {

// Called when the user wants to export the entire current text as a URL.

// Sets the url, and if known, the title and favicon.

- void GetDataForURLExport(GURL* url, string16* title, SkBitmap* favicon);

+ void GetDataForURLExport(GURL* url, string16* title, gfx::Image* favicon);

// Returns true if a verbatim query should be used for Instant. A verbatim

// query is forced in certain situations, such as pressing delete at the end