chrome/browser/ui/omnibox/omnibox_edit_model.cc - 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.cc

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

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

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

index d24f566f93c703589f322a80ab82854420ed36f2..b1f348df0cd7c39a29db70b065c534759688aa66 100644

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

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

@@ -55,7 +55,7 @@

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_view.h"

#include "googleurl/src/url_util.h"

-#include "third_party/skia/include/core/SkBitmap.h"

+#include "ui/gfx/image/image.h"

using content::UserMetricsAction;

using predictors::AutocompleteActionPredictor;

@@ -275,7 +275,7 @@ void OmniboxEditModel::OnChanged() {

void OmniboxEditModel::GetDataForURLExport(GURL* url,

string16* title,

- SkBitmap* favicon) {

+ gfx::Image* favicon) {

AutocompleteMatch match;

GetInfoForCurrentText(&match, NULL);

*url = match.destination_url;