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

Unified Diff: ui/base/resource/resource_bundle.cc

Issue 9035010: Move frame color constants to CustomFrameView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « ui/base/resource/resource_bundle.h ('k') | ui/views/window/custom_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index bc40368cd450ba18e787d80489cd40d48c917212..fc5a8c791b7d8d8d7470a683a5ae729744d3aff2 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -43,19 +43,6 @@ const int kLargeFontSizeDelta = 8;
ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
// static
-// TODO(glen): Finish moving these into theme provider (dialogs still
-// depend on these colors).
-#if defined(USE_AURA)
-const SkColor ResourceBundle::frame_color =
- SkColorSetRGB(109, 109, 109);
-const SkColor ResourceBundle::frame_color_inactive =
- SkColorSetRGB(176, 176, 176);
-#else
-const SkColor ResourceBundle::frame_color =
- SkColorSetRGB(66, 116, 201);
-const SkColor ResourceBundle::frame_color_inactive =
- SkColorSetRGB(161, 182, 228);
-#endif
const SkColor ResourceBundle::toolbar_color =
SkColorSetRGB(210, 225, 246);
const SkColor ResourceBundle::toolbar_separator_color =
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/views/window/custom_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698