Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

chrome/browser/chromeos/login/helper.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/chromeos/login/helper.h"
 
 #include "base/file_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 23 matching lines @@
 
 const char kAccountRecoveryHelpUrl[] =
     "https://www.google.com/support/accounts/bin/answer.py?answer=48598";
 
 }  // namespace
 
 views::SmoothedThrobber* CreateDefaultSmoothedThrobber() {
   views::SmoothedThrobber* throbber =
       new views::SmoothedThrobber(kThrobberFrameMs);
   throbber->SetFrames(
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SPINNER));
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_SPINNER));
   throbber->set_start_delay_ms(kThrobberStartDelayMs);
   return throbber;
 }
 
 views::Throbber* CreateDefaultThrobber() {
   views::Throbber* throbber = new views::Throbber(kThrobberFrameMs, false);
   throbber->SetFrames(
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SPINNER));
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_SPINNER));
   return throbber;
 }
 
 gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
   gfx::Rect bounds(gfx::Screen::GetPrimaryMonitor().bounds());
   if (!size.IsEmpty()) {
     int horizontal_diff = bounds.width() - size.width();
     int vertical_diff = bounds.height() - size.height();
     bounds.Inset(horizontal_diff / 2, vertical_diff / 2);
   }
@@ skipping 29 matching lines @@
   } else if (network_library->wifi_connecting()) {
     return UTF8ToUTF16(network_library->wifi_network()->name());
   } else if (network_library->cellular_connecting()) {
     return UTF8ToUTF16(network_library->cellular_network()->name());
   } else {
     return string16();
   }
 }
 
 }  // namespace chromeos