ChromeCanvas->gfx::Canvas

views/window/custom_frame_view.cc

 // Copyright (c) 2009 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 "views/window/custom_frame_view.h"
 
-#include "app/gfx/chrome_canvas.h"
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #include "base/win_util.h"
 #endif
 #include "grit/theme_resources.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
@@ skipping 184 matching lines @@
 void CustomFrameView::ResetWindowControls() {
   restore_button_->SetState(CustomButton::BS_NORMAL);
   minimize_button_->SetState(CustomButton::BS_NORMAL);
   maximize_button_->SetState(CustomButton::BS_NORMAL);
   // The close button isn't affected by this constraint.
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameView, View overrides:
 
-void CustomFrameView::Paint(ChromeCanvas* canvas) {
+void CustomFrameView::Paint(gfx::Canvas* canvas) {
   if (frame_->IsMaximized())
     PaintMaximizedFrameBorder(canvas);
   else
     PaintRestoredFrameBorder(canvas);
   PaintTitleBar(canvas);
   if (!frame_->IsMaximized())
     PaintRestoredClientEdge(canvas);
 }
 
 void CustomFrameView::Layout() {
@@ skipping 64 matching lines @@
     int title_adjust = (kFrameBorderThickness / 2);
     *title_top_spacing += title_adjust;
     title_bottom_spacing -= title_adjust;
   }
   *title_thickness = std::max(title_font_->height(),
       min_titlebar_height - *title_top_spacing - title_bottom_spacing);
   return *title_top_spacing + *title_thickness + title_bottom_spacing +
       BottomEdgeThicknessWithinNonClientHeight();
 }
 
-void CustomFrameView::PaintRestoredFrameBorder(ChromeCanvas* canvas) {
+void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   // Window frame mode.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   SkBitmap* theme_frame;
   SkColor frame_color;
 
   if (frame_->IsActive()) {
     theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME);
     frame_color = ResourceBundle::frame_color;
   } else {
@@ skipping 57 matching lines @@
   canvas->DrawBitmapInt(*bottom_left_corner, 0,
                         height() - bottom_left_corner->height());
 
   // Left.
   canvas->TileImageInt(*left_edge, 0, top_left_corner->height(),
       left_edge->width(),
       height() - top_left_corner->height() - bottom_left_corner->height());
 }
 
 void CustomFrameView::PaintMaximizedFrameBorder(
-    ChromeCanvas* canvas) {
+    gfx::Canvas* canvas) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   SkBitmap* top_edge = rb.GetBitmapNamed(IDR_WINDOW_TOP_CENTER);
   canvas->TileImageInt(*top_edge, 0, FrameBorderThickness(), width(),
                        top_edge->height());
 
   // The bottom of the titlebar actually comes from the top of the Client Edge
   // graphic, with the actual client edge clipped off the bottom.
   SkBitmap* titlebar_bottom = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
   int edge_height = titlebar_bottom->height() - kClientEdgeThickness;
   canvas->TileImageInt(*titlebar_bottom, 0,
       frame_->GetClientView()->y() - edge_height, width(), edge_height);
 }
 
-void CustomFrameView::PaintTitleBar(ChromeCanvas* canvas) {
+void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   WindowDelegate* d = frame_->GetDelegate();
 
   // It seems like in some conditions we can be asked to paint after the window
   // that contains us is WM_DESTROYed. At this point, our delegate is NULL. The
   // correct long term fix may be to shut down the RootView in WM_DESTROY.
   if (!d)
     return;
 
   canvas->DrawStringInt(d->GetWindowTitle(), *title_font_, SK_ColorWHITE,
       MirroredLeftPointForRect(title_bounds_), title_bounds_.y(),
       title_bounds_.width(), title_bounds_.height());
 }
 
-void CustomFrameView::PaintRestoredClientEdge(ChromeCanvas* canvas) {
+void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   gfx::Rect client_area_bounds = frame_->GetClientView()->bounds();
   int client_area_top = client_area_bounds.y();
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SkBitmap* top_left = rb.GetBitmapNamed(IDR_APP_TOP_LEFT);
   SkBitmap* top = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
   SkBitmap* top_right = rb.GetBitmapNamed(IDR_APP_TOP_RIGHT);
   SkBitmap* right = rb.GetBitmapNamed(IDR_CONTENT_RIGHT_SIDE);
   SkBitmap* bottom_right =
       rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER);
@@ skipping 172 matching lines @@
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO: need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views