Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

ash/system/tray_caps_lock.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 "ash/system/tray_caps_lock.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 17 matching lines @@
         shortcut_label_(new views::Label) {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           kTrayPopupPaddingHorizontal,
                                           0,
                                           kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     FixedSizedImageView* image =
         new FixedSizedImageView(0, kTrayPopupItemHeight);
     image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
-        ToSkBitmap());
+        ToImageSkia());
     AddChildView(image);
 
     text_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(text_label_);
 
     shortcut_label_->SetEnabled(false);
     AddChildView(shortcut_label_);
   }
 
   virtual ~CapsLockDefaultView() {}
@@ skipping 75 matching lines @@
   DCHECK(detailed_ == NULL);
   detailed_ = new views::View;
 
   detailed_->SetLayoutManager(new
       views::BoxLayout(views::BoxLayout::kHorizontal,
       kTrayPopupPaddingHorizontal, 10, kTrayPopupPaddingBetweenItems));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
   image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
-      ToSkBitmap());
+      ToImageSkia());
 
   detailed_->AddChildView(image);
 
   const int string_id = search_mapped_to_caps_lock_ ?
       IDS_ASH_STATUS_TRAY_CAPS_LOCK_ENABLED_PRESS_SEARCH :
       IDS_ASH_STATUS_TRAY_CAPS_LOCK_ENABLED_PRESS_SHIFT_AND_SEARCH_KEYS;
   detailed_->AddChildView(
       new views::Label(bundle.GetLocalizedString(string_id)));
 
   return detailed_;
@@ skipping 20 matching lines @@
   } else {
     if (enabled)
       PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
     else if (detailed_)
       detailed_->GetWidget()->Close();
   }
 }
 
 }  // namespace internal
 }  // namespace ash