diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 22:35:42 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 22:35:42 +0000 |
| commit | 004a96a015b5dfcadaad4ea1b192c97c415b75de (patch) | |
| tree | cb32d3809e4366c07e837416a106a3083d2690a5 /chrome/browser/views/options/content_page_view.cc | |
| parent | f8ed412acb7bcab9855d0ebd9d29f7e38a3a8f92 (diff) | |
| download | chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.zip chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.tar.gz chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.tar.bz2 | |
Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.
This changes the namespace in those files from "gfx" to "skia".
I split skia_utils into two parts, the Windows specific part is now in a separate file called skia_utils_win.
There were several obsolete includes of these headers which I removed. I also removed img_resize_perftest which isn't used and has bitrotted.
Review URL: http://codereview.chromium.org/12842
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options/content_page_view.cc')
| -rw-r--r-- | chrome/browser/views/options/content_page_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index e4e443d..a534a4b 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" -#include "base/gfx/skia_utils.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" @@ -31,6 +30,7 @@ #include "chrome/views/text_field.h" #include "chrome/views/widget.h" #include "generated_resources.h" +#include "skia/ext/skia_utils_win.h" #include "skia/include/SkBitmap.h" namespace { @@ -102,7 +102,7 @@ void FileDisplayArea::Paint(ChromeCanvas* canvas) { RECT rect = { 0, 0, width(), height() }; gfx::NativeTheme::instance()->PaintTextField( dc, EP_EDITTEXT, ETS_READONLY, 0, &rect, - gfx::SkColorToCOLORREF(text_field_background_color_), true, true); + skia::SkColorToCOLORREF(text_field_background_color_), true, true); canvas->endPlatformPaint(); canvas->DrawBitmapInt(default_folder_icon_, icon_bounds_.x(), icon_bounds_.y()); |