Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Unified Diff: chrome/browser/views/options/content_page_view.cc

Issue 12842: Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/bookmark_manager_view.cc ('k') | chrome/browser/views/options/fonts_page_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/options/content_page_view.cc
===================================================================
--- chrome/browser/views/options/content_page_view.cc (revision 6142)
+++ chrome/browser/views/options/content_page_view.cc (working copy)
@@ -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 @@
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());
« no previous file with comments | « chrome/browser/views/bookmark_manager_view.cc ('k') | chrome/browser/views/options/fonts_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698