| Index: chrome/views/text_field.cc
|
| ===================================================================
|
| --- chrome/views/text_field.cc (revision 6142)
|
| +++ chrome/views/text_field.cc (working copy)
|
| @@ -12,7 +12,6 @@
|
| #include <vsstyle.h>
|
|
|
| #include "base/gfx/native_theme.h"
|
| -#include "base/gfx/skia_utils.h"
|
| #include "base/scoped_clipboard_writer.h"
|
| #include "base/string_util.h"
|
| #include "base/win_util.h"
|
| @@ -25,8 +24,8 @@
|
| #include "chrome/views/hwnd_view.h"
|
| #include "chrome/views/menu.h"
|
| #include "chrome/views/widget.h"
|
| -
|
| #include "generated_resources.h"
|
| +#include "skia/ext/skia_utils_win.h"
|
|
|
| using gfx::NativeTheme;
|
|
|
| @@ -1087,7 +1086,7 @@
|
|
|
| COLORREF bg_color;
|
| if (!use_default_background_color_)
|
| - bg_color = gfx::SkColorToCOLORREF(background_color_);
|
| + bg_color = skia::SkColorToCOLORREF(background_color_);
|
| else
|
| bg_color = GetSysColor(read_only_ ? COLOR_3DFACE : COLOR_WINDOW);
|
| edit_->SetBackgroundColor(bg_color);
|
|
|