Get rid of implicit conversion to and from ImageSkiaRep

chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

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 643280e3618d5526dede7255bbfa18caa97a6c1e..ba80698d67a0d7ca2691a91849fb6824b8ffdc56 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -86,7 +86,7 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
     item->SetString("label", model->GetLabelAt(i));
     gfx::ImageSkia icon;
     if (model->GetIconAt(i, &icon)) {
-      gfx::ImageSkiaRep icon_bitmap = icon.GetRepresentation(
+      SkBitmap icon_bitmap = icon.GetRepresentation(

[oshima, 2012/07/09 18:22:22]

shouldn't this be ImageSkiaRep?

[pkotwicz, 2012/07/09 19:36:36]

Nope, we get the bitmap. Take a look at the end of the following line =]

[oshima, 2012/07/09 19:40:58]

in image_skia.h

  // Returns the image rep whose density best matches
  // |scale_factor|.
  // Returns a null image rep if the object contains no image reps.
  const gfx::ImageSkiaRep& GetRepresentation(
      ui::ScaleFactor scale_factor) const;

ah i see. so it was unnecessary from the beginning?

           ui::GetScaleFactorFromScale(web_ui_->GetDeviceScale())).sk_bitmap();
       item->SetString("icon", web_ui_util::GetImageDataUrl(icon_bitmap));
     }
@@ -161,7 +161,7 @@ void NetworkDropdown::NetworkMenuIconChanged() {
 void NetworkDropdown::SetNetworkIconAndText() {
   string16 text;
   const gfx::ImageSkia icon_image = network_icon_->GetIconAndText(&text);
-  gfx::ImageSkiaRep icon_bitmap = icon_image.GetRepresentation(
+  SkBitmap icon_bitmap = icon_image.GetRepresentation(

[oshima, 2012/07/09 18:22:22]

same here.

[pkotwicz, 2012/07/09 19:36:36]

Same thing

       ui::GetScaleFactorFromScale(web_ui_->GetDeviceScale())).sk_bitmap();
   std::string icon_str =
       icon_image.empty() ?