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

ui/views/controls/tree/tree_view_views.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 UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
 #define UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/tree_node_model.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 class Textfield;
 class TreeViewController;
 
 // TreeView displays hierarchical data as returned from a TreeModel. The user
@@ skipping 278 matching lines @@
   void ExpandOrSelectChild();
 
   // Implementation of Expand(). Returns true if at least one node was expanded
   // that previously wasn't.
   bool ExpandImpl(ui::TreeModelNode* model_node);
 
   // The model, may be null.
   ui::TreeModel* model_;
 
   // Default icons for closed/open.
-  SkBitmap closed_icon_;
-  SkBitmap open_icon_;
+  gfx::ImageSkia closed_icon_;
+  gfx::ImageSkia open_icon_;
 
   // Icons from the model.
-  std::vector<SkBitmap> icons_;
+  std::vector<gfx::ImageSkia> icons_;
 
   // The root node.
   InternalNode root_;
 
   // The selected node, may be NULL.
   InternalNode* selected_node_;
 
   // Non-null when editing.
   Textfield* editor_;
 
@@ skipping 31 matching lines @@
   // Offset the text is drawn at. This accounts for the size of the expand
   // control, icon and offsets.
   int text_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_