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

ash/system/tray/system_tray_delegate.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/power/power_supply_status.h"
 #include "base/file_path.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-
-class SkBitmap;
+#include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 
 struct ASH_EXPORT NetworkIconInfo {
   NetworkIconInfo();
   ~NetworkIconInfo();
 
   bool highlight;
   bool tray_icon_visible;
-  SkBitmap image;
+  gfx::ImageSkia image;
   string16 name;
   string16 description;
   std::string service_path;
 };
 
 struct ASH_EXPORT BluetoothDeviceInfo {
   BluetoothDeviceInfo();
   ~BluetoothDeviceInfo();
 
   std::string address;
@@ skipping 243 matching lines @@
   // Opens the cellular network specific URL.
   virtual void ShowCellularURL(const std::string& url) = 0;
 
   // Shows UI for changing proxy settings.
   virtual void ChangeProxySettings() = 0;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_