ChromeCanvas->gfx::Canvas

views/view_unittest.cc

 // Copyright (c) 2006-2008 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 "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "base/clipboard.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
 #if defined(OS_WIN)
 #include "views/controls/button/native_button_win.h"
 #endif
 #include "views/controls/scroll_view.h"
@@ skipping 25 matching lines @@
 };
 
 // Paints the RootView.
 void PaintRootView(views::RootView* root, bool empty_paint) {
   if (!empty_paint) {
     root->PaintNow();
   } else {
     // User isn't logged in, so that PaintNow will generate an empty rectangle.
     // Invoke paint directly.
     gfx::Rect paint_rect = root->GetScheduledPaintRect();
-    ChromeCanvas canvas(paint_rect.width(), paint_rect.height(), true);
+    gfx::Canvas canvas(paint_rect.width(), paint_rect.height(), true);
     canvas.TranslateInt(-paint_rect.x(), -paint_rect.y());
     canvas.ClipRectInt(0, 0, paint_rect.width(), paint_rect.height());
     root->ProcessPaint(&canvas);
   }
 }
 
 /*
 typedef CWinTraits<WS_VISIBLE|WS_CLIPCHILDREN|WS_CLIPSIBLINGS> CVTWTraits;
 
 // A trivial window implementation that tracks whether or not it has been
@@ skipping 62 matching lines @@
     location_.y = 0;
     last_clip_.setEmpty();
   }
 
   virtual void DidChangeBounds(const gfx::Rect& previous,
                                const gfx::Rect& current);
   virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
   virtual bool OnMousePressed(const MouseEvent& event);
   virtual bool OnMouseDragged(const MouseEvent& event);
   virtual void OnMouseReleased(const MouseEvent& event, bool canceled);
-  virtual void Paint(ChromeCanvas* canvas);
+  virtual void Paint(gfx::Canvas* canvas);
 
   // DidChangeBounds test
   bool did_change_bounds_;
   gfx::Rect previous_bounds_;
   gfx::Rect new_bounds_;
 
   // AddRemoveNotifications test
   bool child_added_;
   bool child_removed_;
   View* parent_;
@@ skipping 198 matching lines @@
   // Make sure v1 did not receive the event
   EXPECT_EQ(v1->last_mouse_event_type_, 0);
 
   window.CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Painting
 ////////////////////////////////////////////////////////////////////////////////
 
-void TestView::Paint(ChromeCanvas* canvas) {
+void TestView::Paint(gfx::Canvas* canvas) {
   canvas->getClipBounds(&last_clip_);
 }
 
 void CheckRect(const SkRect& check_rect, const SkRect& target_rect) {
   EXPECT_EQ(target_rect.fLeft, check_rect.fLeft);
   EXPECT_EQ(target_rect.fRight, check_rect.fRight);
   EXPECT_EQ(target_rect.fTop, check_rect.fTop);
   EXPECT_EQ(target_rect.fBottom, check_rect.fBottom);
 }
 
@@ skipping 634 matching lines @@
   SimularePressingEnterAndCheckDefaultButton(OK);
 
   // Focus the cancel button.
   client_view_->FocusWillChange(NULL, cancel_button_);
   EXPECT_FALSE(ok_button_->is_default());
   EXPECT_TRUE(cancel_button_->is_default());
   EXPECT_FALSE(dialog_view_->button1_->is_default());
   EXPECT_FALSE(dialog_view_->button2_->is_default());
   SimularePressingEnterAndCheckDefaultButton(CANCEL);
 }