Use high DPI assets for network selection oobe screen

Change drop-image CSS style to 25 pixels wide to match actual width of images.

BUG=None
TEST=Manual

Depends on http://codereview.chromium.org/10535134/

Review URL: https://chromiumcodereview.appspot.com/10541142

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142562 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 5 deletions

diff --git a/chrome/browser/resources/chromeos/login/network_dropdown.css b/chrome/browser/resources/chromeos/login/network_dropdown.css
index cdb7b2d..4c248ce 100644
--- a/chrome/browser/resources/chromeos/login/network_dropdown.css
+++ b/chrome/browser/resources/chromeos/login/network_dropdown.css
@@ -102,7 +102,7 @@
 }
 
 .dropdown-image {
-  width: 24px;
+  width: 25px;
 }
 
 .dropdown-item {
diff --git a/chrome/browser/resources/chromeos/login/network_dropdown.js b/chrome/browser/resources/chromeos/login/network_dropdown.js
index a19dad9..2a4325f 100644
--- a/chrome/browser/resources/chromeos/login/network_dropdown.js
+++ b/chrome/browser/resources/chromeos/login/network_dropdown.js
@@ -198,6 +198,7 @@ cr.define('cr.ui', function() {
           span.classList.add('bold');
         var image = this.ownerDocument.createElement('img');
         image.alt = '';
+        image.classList.add('dropdown-image');
         if (item.icon)
           image.src = item.icon;
       }
@@ -219,7 +220,6 @@ cr.define('cr.ui', function() {
           wrapperDiv.setAttribute('aria-disabled', 'true');
         wrapperDiv.classList.add('dropdown-item-container');
         var imageDiv = this.ownerDocument.createElement('div');
-        imageDiv.classList.add('dropdown-image');
         imageDiv.appendChild(image);
         wrapperDiv.appendChild(imageDiv);
         wrapperDiv.appendChild(itemElement);
@@ -266,6 +266,7 @@ cr.define('cr.ui', function() {
     createTitle_: function() {
       var image = this.ownerDocument.createElement('img');
       image.alt = '';
+      image.classList.add('dropdown-image');
       var text = this.ownerDocument.createElement('div');
 
       var el = this.ownerDocument.createElement('div');
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index 36cd990..7dbf2e5 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -75,8 +75,12 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
     item->SetInteger("id", id);
     item->SetString("label", model->GetLabelAt(i));
     gfx::ImageSkia icon;
-    if (model->GetIconAt(i, &icon))
-      item->SetString("icon", web_ui_util::GetImageDataUrl(icon));
+    if (model->GetIconAt(i, &icon)) {
+      float icon_scale;
+      SkBitmap icon_bitmap = icon.GetBitmapForScale(
+          web_ui_->GetDeviceScale(), &icon_scale);
+      item->SetString("icon", web_ui_util::GetImageDataUrl(icon_bitmap));
+    }
     if (id >= 0) {
       item->SetBoolean("enabled", model->IsEnabledAt(i));
       const gfx::Font* font = model->GetLabelFontAt(i);
@@ -150,9 +154,12 @@ void NetworkDropdown::NetworkMenuIconChanged() {
 void NetworkDropdown::SetNetworkIconAndText() {
   string16 text;
   const gfx::ImageSkia icon_image = network_icon_->GetIconAndText(&text);
+  float icon_scale;
+  SkBitmap icon_bitmap = icon_image.GetBitmapForScale(
+      web_ui_->GetDeviceScale(), &icon_scale);
   std::string icon_str =
       icon_image.empty() ?
-          std::string() : web_ui_util::GetImageDataUrl(icon_image);
+          std::string() : web_ui_util::GetImageDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",