chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc - Issue 24175004: 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: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/extension_icon_image.h ('K') | « chrome/browser/ui/webui/ntp/ntp_login_handler.cc ('k') | chrome/common/badge_util.cc » ('j') | ui/views/controls/button/image_button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

index 6c19b832edd1cce08dfe083264fb7650f9a98e22..803346627d196838106aa765ff7216a8a79a531f 100644

--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

@@ -433,7 +433,8 @@ class NetworkInfoDictionary {

private:

void SetIcon(const gfx::ImageSkia& icon,

ui::ScaleFactor icon_scale_factor) {

- gfx::ImageSkiaRep image_rep = icon.GetRepresentation(icon_scale_factor);

+ gfx::ImageSkiaRep image_rep

+ = icon.GetRepresentation(ui::GetScaleFactorScale(icon_scale_factor));

icon_url_ = icon.isNull() ? "" : webui::GetBitmapDataUrl(

image_rep.sk_bitmap());

}

@@ -1281,7 +1282,7 @@ std::string InternetOptionsHandler::GetIconDataUrl(int resource_id) const {

gfx::ImageSkia* icon =

ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);

gfx::ImageSkiaRep image_rep = icon->GetRepresentation(

- web_ui()->GetDeviceScaleFactor());

+ ui::GetScaleFactorScale(web_ui()->GetDeviceScaleFactor()));

return webui::GetBitmapDataUrl(image_rep.sk_bitmap());

}