9 files changed, 20 insertions, 20 deletions
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index af6a7b4..0097251 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -4,7 +4,7 @@
 
 #include "views/controls/button/checkbox.h"
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "views/controls/label.h"
 
 namespace views {
@@ -85,7 +85,7 @@ void Checkbox::Layout() {
   native_wrapper_->GetView()->Layout();
 }
 
-void Checkbox::PaintFocusBorder(ChromeCanvas* canvas) {
+void Checkbox::PaintFocusBorder(gfx::Canvas* canvas) {
   // Our focus border is rendered by the label, so we don't do anything here.
 }
 
diff --git a/views/controls/button/checkbox.h b/views/controls/button/checkbox.h
index db6706b..86111d1 100644
--- a/views/controls/button/checkbox.h
+++ b/views/controls/button/checkbox.h
@@ -41,7 +41,7 @@ class Checkbox : public NativeButton {
   // Overridden from View:
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
-  virtual void PaintFocusBorder(ChromeCanvas* canvas);
+  virtual void PaintFocusBorder(gfx::Canvas* canvas);
   virtual View* GetViewForPoint(const gfx::Point& point);
   virtual View* GetViewForPoint(const gfx::Point& point,
                                 bool can_create_floating);
diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 3c4c7fe..087b4f0 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -4,7 +4,7 @@
 
 #include "views/controls/button/image_button.h"
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/throb_animation.h"
 #include "skia/ext/image_operations.h"
 
@@ -20,7 +20,7 @@ ImageButton::ImageButton(ButtonListener* listener)
     : CustomButton(listener),
       h_alignment_(ALIGN_LEFT),
       v_alignment_(ALIGN_TOP) {
-  // By default, we request that the ChromeCanvas passed to our View::Paint()
+  // By default, we request that the gfx::Canvas passed to our View::Paint()
   // implementation is flipped horizontally so that the button's bitmaps are
   // mirrored when the UI directionality is right-to-left.
   EnableCanvasFlippingForRTLUI(true);
@@ -49,7 +49,7 @@ gfx::Size ImageButton::GetPreferredSize() {
   return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
-void ImageButton::Paint(ChromeCanvas* canvas) {
+void ImageButton::Paint(gfx::Canvas* canvas) {
   // Call the base class first to paint any background/borders.
   View::Paint(canvas);
 
diff --git a/views/controls/button/image_button.h b/views/controls/button/image_button.h
index da2e0a4..ec3b9ae 100644
--- a/views/controls/button/image_button.h
+++ b/views/controls/button/image_button.h
@@ -33,7 +33,7 @@ class ImageButton : public CustomButton {
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize();
-  virtual void Paint(ChromeCanvas* canvas);
+  virtual void Paint(gfx::Canvas* canvas);
 
  protected:
   // Returns the image to paint. This is invoked from paint and returns a value
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 6dbf4ae..28045a4 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -5,7 +5,7 @@
 #include "views/controls/button/menu_button.h"
 
 #include "app/drag_drop_types.h"
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
@@ -75,7 +75,7 @@ gfx::Size MenuButton::GetPreferredSize() {
   return prefsize;
 }
 
-void MenuButton::Paint(ChromeCanvas* canvas, bool for_drag) {
+void MenuButton::Paint(gfx::Canvas* canvas, bool for_drag) {
   TextButton::Paint(canvas, for_drag);
 
   if (show_menu_marker_) {
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index cbe9ab8..c9a39dd 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -7,7 +7,7 @@
 
 #include <windows.h>
 
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/font.h"
 #include "base/time.h"
 #include "views/background.h"
 #include "views/controls/button/text_button.h"
@@ -44,7 +44,7 @@ class MenuButton : public TextButton {
 
   // Overridden to take into account the potential use of a drop marker.
   virtual gfx::Size GetPreferredSize();
-  virtual void Paint(ChromeCanvas* canvas, bool for_drag);
+  virtual void Paint(gfx::Canvas* canvas, bool for_drag);
 
   // These methods are overriden to implement a simple push button
   // behavior
diff --git a/views/controls/button/native_button.h b/views/controls/button/native_button.h
index 8b3fbcf..50aaff73 100644
--- a/views/controls/button/native_button.h
+++ b/views/controls/button/native_button.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/font.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/native_button_wrapper.h"
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index 4f68b90..9bf9e24 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -4,7 +4,7 @@
 
 #include "views/controls/button/text_button.h"
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
@@ -67,7 +67,7 @@ TextButtonBorder::~TextButtonBorder() {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-void TextButtonBorder::Paint(const View& view, ChromeCanvas* canvas) const {
+void TextButtonBorder::Paint(const View& view, gfx::Canvas* canvas) const {
   const TextButton* mb = static_cast<const TextButton*>(&view);
   int state = mb->state();
 
@@ -182,7 +182,7 @@ void TextButton::ClearMaxTextSize() {
   max_text_size_ = text_size_;
 }
 
-void TextButton::Paint(ChromeCanvas* canvas, bool for_drag) {
+void TextButton::Paint(gfx::Canvas* canvas, bool for_drag) {
   if (!for_drag) {
     PaintBackground(canvas);
 
@@ -318,7 +318,7 @@ bool TextButton::OnMousePressed(const MouseEvent& e) {
   return true;
 }
 
-void TextButton::Paint(ChromeCanvas* canvas) {
+void TextButton::Paint(gfx::Canvas* canvas) {
   Paint(canvas, false);
 }
 
diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h
index e0e547c..8b3d343 100644
--- a/views/controls/button/text_button.h
+++ b/views/controls/button/text_button.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/border.h"
 #include "views/controls/button/custom_button.h"
@@ -26,7 +26,7 @@ class TextButtonBorder : public Border {
   virtual ~TextButtonBorder();
 
   // Render the background for the provided view
-  virtual void Paint(const View& view, ChromeCanvas* canvas) const;
+  virtual void Paint(const View& view, gfx::Canvas* canvas) const;
 
   // Returns the insets for the border.
   virtual void GetInsets(gfx::Insets* insets) const;
@@ -92,7 +92,7 @@ class TextButton : public CustomButton {
 
   // Paint the button into the specified canvas. If |for_drag| is true, the
   // function paints a drag image representation into the canvas.
-  virtual void Paint(ChromeCanvas* canvas, bool for_drag);
+  virtual void Paint(gfx::Canvas* canvas, bool for_drag);
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize();
@@ -101,7 +101,7 @@ class TextButton : public CustomButton {
 
  protected:
   virtual bool OnMousePressed(const MouseEvent& e);
-  virtual void Paint(ChromeCanvas* canvas);
+  virtual void Paint(gfx::Canvas* canvas);
 
  private:
   // The text string that is displayed in the button.