| OLD | NEW |
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/views/text_field.h" | 5 #include "chrome/views/text_field.h" |
| 6 | 6 |
| 7 #include <atlbase.h> | 7 #include <atlbase.h> |
| 8 #include <atlapp.h> | 8 #include <atlapp.h> |
| 9 #include <atlcrack.h> | 9 #include <atlcrack.h> |
| 10 #include <atlctrls.h> | 10 #include <atlctrls.h> |
| (...skipping 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1080 | 1080 |
| 1081 return !win_util::IsNumPadDigit(e.GetCharacter(), e.IsExtendedKey()); | 1081 return !win_util::IsNumPadDigit(e.GetCharacter(), e.IsExtendedKey()); |
| 1082 } | 1082 } |
| 1083 | 1083 |
| 1084 void TextField::UpdateEditBackgroundColor() { | 1084 void TextField::UpdateEditBackgroundColor() { |
| 1085 if (!edit_) | 1085 if (!edit_) |
| 1086 return; | 1086 return; |
| 1087 | 1087 |
| 1088 COLORREF bg_color; | 1088 COLORREF bg_color; |
| 1089 if (!use_default_background_color_) | 1089 if (!use_default_background_color_) |
| 1090 bg_color = gfx::SkColorToCOLORREF(background_color_); | 1090 bg_color = skia::SkColorToCOLORREF(background_color_); |
| 1091 else | 1091 else |
| 1092 bg_color = GetSysColor(read_only_ ? COLOR_3DFACE : COLOR_WINDOW); | 1092 bg_color = GetSysColor(read_only_ ? COLOR_3DFACE : COLOR_WINDOW); |
| 1093 edit_->SetBackgroundColor(bg_color); | 1093 edit_->SetBackgroundColor(bg_color); |
| 1094 } | 1094 } |
| 1095 | 1095 |
| 1096 } // namespace views | 1096 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 14079:
Move skia_utils into the skia namespace. (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/