MacViews: draw combobox arrow backgrounds

ui/views/controls/combobox/combobox.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/combobox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/default_style.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/combobox_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/resources/grit/ui_resources.h"
+#include "ui/views/background.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/prefix_selector.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/painter.h"
@@ skipping 307 matching lines @@
       listener_(NULL),
       selected_index_(model_->GetDefaultIndex()),
       invalid_(false),
       menu_model_adapter_(new ComboboxMenuModelAdapter(this, model)),
       text_button_(new TransparentButton(this)),
       arrow_button_(new TransparentButton(this)),
       weak_ptr_factory_(this) {
   ModelChanged();
   SetFocusable(true);
   UpdateBorder();
+  // set_background takes ownership but takes a raw pointer.

[tapted, 2016/03/22 23:04:32]

nit: set_background()

[Elly Fong-Jones, 2016/03/23 18:07:44]

Done.

+  scoped_ptr<Background> b = PlatformStyle::CreateComboboxBackground();
+  set_background(b.release());
 
   // Initialize the button images.
   Button::ButtonState button_states[] = {
     Button::STATE_DISABLED,
     Button::STATE_NORMAL,
     Button::STATE_HOVERED,
     Button::STATE_PRESSED,
   };
   for (int i = 0; i < 2; i++) {
     for (size_t state_index = 0; state_index < arraysize(button_states);
@@ skipping 339 matching lines @@
   gfx::Insets insets = GetInsets();
   insets += gfx::Insets(0, Textfield::kTextPadding, 0, Textfield::kTextPadding);
 
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
   SkColor text_color = GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_LabelEnabledColor);
+      enabled() ? ui::NativeTheme::kColorId_LabelEnabledColor :
+                  ui::NativeTheme::kColorId_LabelDisabledColor);
 
   DCHECK_GE(selected_index_, 0);
   DCHECK_LT(selected_index_, model()->GetItemCount());
   if (selected_index_ < 0 || selected_index_ > model()->GetItemCount())
     selected_index_ = 0;
   base::string16 text = model()->GetItemAt(selected_index_);
 
   gfx::Size arrow_size = ArrowSize();
   int disclosure_arrow_offset = width() - arrow_size.width() -
       GetDisclosureArrowLeftPadding() - GetDisclosureArrowRightPadding();
@@ skipping 200 matching lines @@
   }
   return gfx::Size(width, font_list.GetHeight());
 }
 
 PrefixSelector* Combobox::GetPrefixSelector() {
   if (!selector_)
     selector_.reset(new PrefixSelector(this));
   return selector_.get();
 }
 
+int Combobox::GetArrowButtonWidth() const {

[tapted, 2016/03/22 23:04:32]

nit: move up so it matches declaration order

[Elly Fong-Jones, 2016/03/23 18:07:44]

Done.

+  return GetDisclosureArrowLeftPadding() +
+         ArrowSize().width() +
+         GetDisclosureArrowRightPadding();
+}
+
 }  // namespace views