| 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 ed64f17ffb4d2678393b630925331e28899361e2..f7363f089c7a35a411fb8296e5e8272b4fa245c0 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
|
| @@ -15,6 +15,7 @@
|
| #include "content/public/browser/web_ui.h"
|
| #include "ui/base/models/menu_model.h"
|
| #include "ui/gfx/font.h"
|
| +#include "ui/gfx/image/image.h"
|
| #include "ui/gfx/image/image_skia.h"
|
|
|
| namespace {
|
| @@ -84,9 +85,9 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
|
| base::DictionaryValue* item = new base::DictionaryValue();
|
| item->SetInteger("id", id);
|
| item->SetString("label", model->GetLabelAt(i));
|
| - gfx::ImageSkia icon;
|
| + gfx::Image icon;
|
| if (model->GetIconAt(i, &icon)) {
|
| - SkBitmap icon_bitmap = icon.GetRepresentation(
|
| + SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
|
| ui::GetScaleFactorFromScale(web_ui_->GetDeviceScale())).sk_bitmap();
|
| item->SetString("icon", web_ui_util::GetImageDataUrl(icon_bitmap));
|
| }
|
|
|