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

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

--- trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc (revision 224498)

+++ trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc (working copy)

@@ -90,8 +90,7 @@

gfx::Image icon;

if (model->GetIconAt(i, &icon)) {

SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(

- ui::GetImageScale(

- web_ui_->GetDeviceScaleFactor())).sk_bitmap();

+ web_ui_->GetDeviceScaleFactor()).sk_bitmap();

item->SetString("icon", webui::GetBitmapDataUrl(icon_bitmap));

}

if (id >= 0) {

@@ -193,7 +192,7 @@

RemoveObserver(this);

}

SkBitmap icon_bitmap = icon_image.GetRepresentation(

- ui::GetImageScale(web_ui_->GetDeviceScaleFactor())).sk_bitmap();

+ web_ui_->GetDeviceScaleFactor()).sk_bitmap();

std::string icon_str;

if (!icon_image.isNull())

icon_str = webui::GetBitmapDataUrl(icon_bitmap);