| Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| index 57af9b5a1f2d9c628259a727618c28a00b396342..f99da94ef8144b97481b682bedd2bada14be9669 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| @@ -90,7 +90,8 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
|
| gfx::Image icon;
|
| if (model->GetIconAt(i, &icon)) {
|
| SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
|
| - web_ui_->GetDeviceScaleFactor()).sk_bitmap();
|
| + ui::GetScaleFactorScale(
|
| + web_ui_->GetDeviceScaleFactor())).sk_bitmap();
|
| item->SetString("icon", webui::GetBitmapDataUrl(icon_bitmap));
|
| }
|
| if (id >= 0) {
|
| @@ -192,7 +193,7 @@ void NetworkDropdown::SetNetworkIconAndText() {
|
| RemoveObserver(this);
|
| }
|
| SkBitmap icon_bitmap = icon_image.GetRepresentation(
|
| - web_ui_->GetDeviceScaleFactor()).sk_bitmap();
|
| + ui::GetScaleFactorScale(web_ui_->GetDeviceScaleFactor())).sk_bitmap();
|
| std::string icon_str;
|
| if (!icon_image.isNull())
|
| icon_str = webui::GetBitmapDataUrl(icon_bitmap);
|
|
|