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

Unified Diff: ui/gfx/native_theme_base.cc

Issue 8597015: Add a new GetSystemColor method to native theme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move hardcoded colors into constants Created 9 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
Index: ui/gfx/native_theme_base.cc
diff --git a/ui/gfx/native_theme_base.cc b/ui/gfx/native_theme_base.cc
index 95ba5aa1e681b1856e4f246b1c6837bab2157c68..1cfe9fd6f1e82a522b6d3a47107d0993a4fae236 100644
--- a/ui/gfx/native_theme_base.cc
+++ b/ui/gfx/native_theme_base.cc
@@ -16,6 +16,11 @@
namespace gfx {
+namespace {
+// Hardcoded colors for use when there is no system theme (Aura, ChromeOS).
+const SkColor kDefaultDialogBackgroundColor = SkColorSetRGB(200, 200, 200);
+}
+
unsigned int NativeThemeBase::button_length_ = 14;
#if defined(TOUCH_UI)
unsigned int NativeThemeBase::scrollbar_width_ = 0;
@@ -57,6 +62,19 @@ NativeThemeBase::NativeThemeBase() {
NativeThemeBase::~NativeThemeBase() {
}
+// This implementation returns hardcoded colors. It's used by NativeThemeAura
+// and NativeThemeChromeos and overridden by NativeThemeGtk.
+SkColor NativeThemeBase::GetSystemColor(ColorId color_id) const {
+ switch (color_id) {
+ case kDialogBackgroundColorId:
+ return kDefaultDialogBackgroundColor;
+ default:
+ NOTREACHED() << "Invalid color_id: " << color_id;
+ break;
+ }
+ return kColorYouShouldNeverSee;
+}
+
gfx::Size NativeThemeBase::GetPartSize(Part part,
State state,
const ExtraParams& extra) const {

Powered by Google App Engine
This is Rietveld 408576698