Make all the menu UI consitent with the new chromeos menu spec.

ui/views/controls/label.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/native_theme.h"
 #include "ui/views/background.h"
 
 namespace views {
 
 // static
 const char Label::kViewClassName[] = "views/Label";
 
 const int Label::kFocusBorderPadding = 1;
 
 Label::Label() {
@@ skipping 319 matching lines @@
 gfx::Font Label::GetDefaultFont() {
   return ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 }
 
 void Label::Init(const string16& text, const gfx::Font& font) {
   static bool initialized = false;
   static SkColor kDefaultEnabledColor;
   static SkColor kDefaultDisabledColor;
   static SkColor kDefaultBackgroundColor;
   if (!initialized) {
-#if defined(OS_WIN)
-    kDefaultEnabledColor = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
-    kDefaultDisabledColor = color_utils::GetSysSkColor(COLOR_GRAYTEXT);
-    kDefaultBackgroundColor = color_utils::GetSysSkColor(COLOR_WINDOW);
-#else
-    // TODO(beng): source from theme provider.
-    kDefaultEnabledColor = SK_ColorBLACK;
-    kDefaultDisabledColor = SK_ColorGRAY;
-    kDefaultBackgroundColor = SK_ColorWHITE;
-#endif
-
+    kDefaultEnabledColor = gfx::NativeTheme::instance()->GetSystemColor(

[sky, 2012/04/30 20:52:05]

Do we really need to cache these values here and in the theme?

[jennyz, 2012/04/30 21:23:09]

Done.

+        gfx::NativeTheme::kColorId_LabelEnabledColor);
+    kDefaultDisabledColor = gfx::NativeTheme::instance()->GetSystemColor(
+        gfx::NativeTheme::kColorId_LabelDisabledColor);
+    kDefaultBackgroundColor = gfx::NativeTheme::instance()->GetSystemColor(
+        gfx::NativeTheme::kColorId_LabelBackgroundColor);
     initialized = true;
   }
 
   contains_mouse_ = false;
   font_ = font;
   text_size_valid_ = false;
   requested_enabled_color_ = kDefaultEnabledColor;
   requested_disabled_color_ = kDefaultDisabledColor;
   background_color_ = kDefaultBackgroundColor;
   auto_color_readability_ = true;
@@ skipping 149 matching lines @@
                                 ui::ELIDE_IN_MIDDLE);
   } else {
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeDrawStringFlags();
 }
 
 }  // namespace views