trunk/src/chrome/browser/android/provider/chrome_browser_provider.cc - Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

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: trunk/src/chrome/browser/android/provider/chrome_browser_provider.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 3 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: trunk/src/chrome/browser/android/provider/chrome_browser_provider.cc

===================================================================

--- trunk/src/chrome/browser/android/provider/chrome_browser_provider.cc (revision 224497)

+++ trunk/src/chrome/browser/android/provider/chrome_browser_provider.cc (working copy)

@@ -39,7 +39,6 @@

#include "sql/statement.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/layout.h"

-#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/favicon_size.h"

using base::android::AttachCurrentThread;

@@ -677,7 +676,7 @@

url,

chrome::FAVICON | chrome::TOUCH_ICON,

gfx::kFaviconSize),

- ResourceBundle::GetSharedInstance().GetMaxScaleFactor(),

+ ui::GetMaxScaleFactor(),

base::Bind(

&BookmarkIconFetchTask::OnFaviconRetrieved,

base::Unretained(this)),