chrome/browser/ui/search_engines/template_url_table_model.cc - Issue 15388002: Supporting high dpi favicons in Instant Extended.

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/search_engines/template_url_table_model.cc

Issue 15388002: Supporting high dpi favicons in Instant Extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync and rebase Created 7 years, 5 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:

Index: chrome/browser/ui/search_engines/template_url_table_model.cc

diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc

index 44dab8d71e903b2f5aab157b5143583404194b91..918ae0fd9220cb980afadd116907b0d1810e8b6a 100644

--- a/chrome/browser/ui/search_engines/template_url_table_model.cc

+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc

@@ -11,11 +11,11 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/favicon/favicon_service.h"

#include "chrome/browser/favicon/favicon_service_factory.h"

-#include "chrome/browser/favicon/favicon_types.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/common/cancelable_task_tracker.h"

+#include "chrome/common/favicon/favicon_types.h"

#include "grit/generated_resources.h"

#include "grit/ui_resources.h"

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