Write a NativeThemeGtk2 class for linux_aura.

ui/views/controls/combobox/native_combobox_views.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/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
@@ skipping 12 matching lines @@
 const int kMenuBorderWidthRight = 1;
 const int kMenuBorderWidthBottom = 2;
 
 // Limit how small a combobox can be.
 const int kMinComboboxWidth = 148;
 
 // Size of the combobox arrow margins
 const int kDisclosureArrowLeftPadding = 7;
 const int kDisclosureArrowRightPadding = 7;
 
-// Color settings for text and border.
-// These are tentative, and should be derived from theme, system
-// settings and current settings.
-const SkColor kTextColor = SK_ColorBLACK;
-const SkColor kInvalidTextColor = SK_ColorWHITE;
-
 // Define the id of the first item in the menu (since it needs to be > 0)
 const int kFirstMenuItemId = 1000;
 
 // The background to use for invalid comboboxes.
 class InvalidBackground : public Background {
  public:
   InvalidBackground() {}
   virtual ~InvalidBackground() {}
 
   // Overridden from Background:
@@ skipping 255 matching lines @@
 
 void NativeComboboxViews::PaintText(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   canvas->Save();
   canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
-  SkColor text_color = combobox_->invalid() ? kInvalidTextColor : kTextColor;
+  SkColor text_color = GetNativeTheme()->GetSystemColor(
+      combobox_->invalid() ? ui::NativeTheme::kColorId_LabelDisabledColor :

[Evan Stade, 2013/05/01 23:18:50]

this broke the code. For my desktop chromeos build, LabelDisabledColor is not
white, or close to white. It is close to black, and not visible on a red
background.

[Elliot Glaysher, 2013/05/01 23:23:20]

Desktop chromeos shouldn't be using NativeThemeGtk2 instances. Is that what's
going on?

[Evan Stade, 2013/05/01 23:28:45]

no. LabelDisabledColor is just not the right color here (the combobox is not
disabled).

+      ui::NativeTheme::kColorId_LabelEnabledColor);
 
   int index = GetSelectedIndex();
   if (index < 0 || index > combobox_->model()->GetItemCount())
     index = 0;
   string16 text = combobox_->model()->GetItemAt(index);
 
   int disclosure_arrow_offset = width() - disclosure_arrow_->width()
       - kDisclosureArrowLeftPadding - kDisclosureArrowRightPadding;
 
   const gfx::Font& font = Combobox::GetFont();
@@ skipping 65 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views