Get rid of implicit conversion to and from ImageSkiaRep

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
 
 #include <string>
 
 #include "base/time.h"
 #include "base/values.h"
@@ skipping 68 matching lines @@
     int id;
     if (type == ui::MenuModel::TYPE_SEPARATOR)
       id = -2;
     else
       id = model->GetCommandIdAt(i);
     base::DictionaryValue* item = new base::DictionaryValue();
     item->SetInteger("id", id);
     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));
     }
     if (id >= 0) {
       item->SetBoolean("enabled", model->IsEnabledAt(i));
       const gfx::Font* font = model->GetLabelFontAt(i);
       if (font) {
         item->SetBoolean("bold", font->GetStyle() == gfx::Font::BOLD);
       }
     }
@@ skipping 54 matching lines @@
   network_menu_->UpdateMenu();
 }
 
 void NetworkDropdown::NetworkMenuIconChanged() {
   SetNetworkIconAndText();
 }
 
 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() ?
           std::string() : web_ui_util::GetImageDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 void NetworkDropdown::ForceNetworkScan() {
   CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
   Refresh();
 }
 
 }  // namespace chromeos