trunk/src/chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.cc

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

--- trunk/src/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc (revision 224498)

+++ trunk/src/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc (working copy)

@@ -416,8 +416,7 @@

const gfx::ImageSkia& icon,

ui::ScaleFactor icon_scale_factor,

base::DictionaryValue* network_info) {

- gfx::ImageSkiaRep image_rep =

- icon.GetRepresentation(ui::GetImageScale(icon_scale_factor));

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

std::string icon_url =

icon.isNull() ? "" : webui::GetBitmapDataUrl(image_rep.sk_bitmap());

network_info->SetString(kNetworkInfoKeyIconURL, icon_url);

@@ -1218,7 +1217,7 @@

gfx::ImageSkia* icon =

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

gfx::ImageSkiaRep image_rep = icon->GetRepresentation(

- ui::GetImageScale(web_ui()->GetDeviceScaleFactor()));

+ web_ui()->GetDeviceScaleFactor());

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

}