diff options
Diffstat (limited to 'chrome/browser/views/options')
7 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 587bd71..a1ed601 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -12,7 +12,7 @@ #include <vsstyle.h> #include <vssym32.h> -#include "app/gfx/chrome_canvas.h" +#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" @@ -62,7 +62,7 @@ class ListBackground : public views::Background { } virtual ~ListBackground() {} - virtual void Paint(ChromeCanvas* canvas, views::View* view) const { + virtual void Paint(gfx::Canvas* canvas, views::View* view) const { HDC dc = canvas->beginPlatformPaint(); RECT native_lb = view->GetLocalBounds(true).ToRECT(); gfx::NativeTheme::instance()->PaintListBackground(dc, true, &native_lb); diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index ef822ee12..77dd376 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -9,7 +9,7 @@ #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" @@ -54,7 +54,7 @@ class FileDisplayArea : public views::View { 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(); @@ -104,7 +104,7 @@ void FileDisplayArea::SetFile(const FilePath& file_path) { } } -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( diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index a294fff..f937c6d 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "app/gfx/chrome_canvas.h" +#include "app/gfx/canvas.h" #include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 41cb561..3488d10 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,8 +11,8 @@ #include <vector> -#include "app/gfx/chrome_canvas.h" -#include "app/gfx/chrome_font.h" +#include "app/gfx/canvas.h" +#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -113,7 +113,7 @@ class FontDisplayView : public views::View { int font_size() { return font_size_; } // views::View overrides: - virtual void Paint(ChromeCanvas* canvas); + virtual void Paint(gfx::Canvas* canvas); virtual void Layout(); virtual gfx::Size GetPreferredSize(); @@ -175,7 +175,7 @@ void FontDisplayView::SetFontType(const std::wstring& font_name, font_text_label_->SetText(displayed_text); } -void FontDisplayView::Paint(ChromeCanvas* canvas) { +void FontDisplayView::Paint(gfx::Canvas* canvas) { HDC dc = canvas->beginPlatformPaint(); RECT rect = { 0, 0, width(), height() }; gfx::NativeTheme::instance()->PaintTextField( diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index c65474e..c768bd6 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -8,8 +8,8 @@ #include "chrome/browser/views/options/languages_page_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/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index a8697ba..73cbf8d 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -7,8 +7,8 @@ #include "chrome/browser/views/options/options_group_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/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" @@ -62,7 +62,7 @@ int OptionsGroupView::GetContentsWidth() const { /////////////////////////////////////////////////////////////////////////////// // OptionsGroupView, views::View overrides: -void OptionsGroupView::Paint(ChromeCanvas* canvas) { +void OptionsGroupView::Paint(gfx::Canvas* canvas) { if (highlighted_) { COLORREF infocolor = GetSysColor(COLOR_INFOBK); SkColor background_color = SkColorSetRGB(GetRValue(infocolor), diff --git a/chrome/browser/views/options/options_group_view.h b/chrome/browser/views/options/options_group_view.h index 1cabd1d..6d5505a1 100644 --- a/chrome/browser/views/options/options_group_view.h +++ b/chrome/browser/views/options/options_group_view.h @@ -34,7 +34,7 @@ class OptionsGroupView : public views::View { protected: // views::View overrides: - virtual void Paint(ChromeCanvas* canvas); + virtual void Paint(gfx::Canvas* canvas); virtual void ViewHierarchyChanged(bool is_add, views::View* parent, views::View* child); |