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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8574033: Beginnings of Window Modality support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' 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
« ui/aura_shell/workspace/workspace.cc ('K') | « ui/base/resource/resource_bundle.h ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.cc
===================================================================
--- ui/base/resource/resource_bundle.cc (revision 110305)
+++ ui/base/resource/resource_bundle.cc (working copy)
@@ -42,13 +42,20 @@
ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
-/* static */
+// static
// TODO(glen): Finish moving these into theme provider (dialogs still
-// depend on these colors).
+// 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::frame_color_app_panel =
SK_ColorWHITE;
const SkColor ResourceBundle::frame_color_app_panel_inactive =
« ui/aura_shell/workspace/workspace.cc ('K') | « ui/base/resource/resource_bundle.h ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698