ChromeCanvas->gfx::Canvas

chrome/browser/views/options/content_page_view.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 "chrome/browser/views/options/content_page_view.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 #include "chrome/browser/views/options/options_group_view.h"
 #include "chrome/browser/views/options/passwords_exceptions_window_view.h"
@@ skipping 24 matching lines @@
 // FileDisplayArea
 
 class FileDisplayArea : public views::View {
  public:
   FileDisplayArea();
   virtual ~FileDisplayArea();
 
   void SetFile(const FilePath& file_path);
 
   // views::View overrides:
-  virtual void Paint(ChromeCanvas* canvas);
+  virtual void Paint(gfx::Canvas* canvas);
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
 
  protected:
   // views::View overrides:
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child);
 
  private:
@@ skipping 29 matching lines @@
   // Force file path to have LTR directionality.
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
     string16 localized_file_path;
     l10n_util::WrapPathWithLTRFormatting(file_path, &localized_file_path);
     text_field_->SetText(UTF16ToWide(localized_file_path));
   } else {
     text_field_->SetText(file_path.ToWStringHack());
   }
 }
 
-void FileDisplayArea::Paint(ChromeCanvas* canvas) {
+void FileDisplayArea::Paint(gfx::Canvas* canvas) {
   HDC dc = canvas->beginPlatformPaint();
   RECT rect = { 0, 0, width(), height() };
   gfx::NativeTheme::instance()->PaintTextField(
       dc, EP_EDITTEXT, ETS_READONLY, 0, &rect,
       skia::SkColorToCOLORREF(text_field_background_color_), true, true);
   canvas->endPlatformPaint();
   // Mirror left point for icon_bounds_ to draw icon in RTL locales correctly.
   canvas->DrawBitmapInt(default_folder_icon_,
                         MirroredLeftPointForRect(icon_bounds_),
                         icon_bounds_.y());
@@ skipping 423 matching lines @@
 
   themes_group_ = new OptionsGroupView(
     contents, l10n_util::GetString(IDS_THEMES_GROUP_NAME),
     L"", false);
 }
 
 void ContentPageView::UpdateDownloadDirectoryDisplay() {
   download_default_download_location_display_->SetFile(
       FilePath::FromWStringHack(default_download_location_.GetValue()));
 }