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>
 
@@ skipping 607 matching lines @@
   if (e.key_code() == ui::VKEY_SPACE && style_ == STYLE_ACTION)
     OnPerformAction();
 
   return false;
 }
 
 void Combobox::OnPaint(gfx::Canvas* canvas) {
   switch (style_) {
     case STYLE_NORMAL: {
       OnPaintBackground(canvas);
+      // Painting the arrow background needs to happen before PaintText applies
+      // a clip rect to |canvas| so the background can touch the border.
+      PaintArrowBackground(canvas);
       PaintText(canvas);
       OnPaintBorder(canvas);
       break;
     }
     case STYLE_ACTION: {
       PaintButtons(canvas);
       PaintText(canvas);
       break;
     }
   }
@@ skipping 168 matching lines @@
   if (0 < arrow_button_hover_alpha) {
     canvas->SaveLayerAlpha(arrow_button_hover_alpha);
     const std::vector<const gfx::ImageSkia*>& arrow_button_hovered_images =
         menu_button_images_[focused][Button::STATE_HOVERED];
     PaintArrowButton(canvas, arrow_button_hovered_images,
                      arrow_button_->x(), height());
     canvas->Restore();
   }
 }
 
+void Combobox::PaintArrowBackground(gfx::Canvas* canvas) {
+  gfx::Canvas::ScopedState canvas_state(canvas);
+
+  if (base::i18n::IsRTL()) {
+    canvas->Translate(gfx::Vector2d(width(), 0));
+    canvas->Scale(-1, 1);
+  }
+
+  gfx::Rect bounds = GetLocalBounds();
+  gfx::Size arrow_size = ArrowSize();
+  int disclosure_arrow_offset = width() - arrow_size.width() -
+      GetDisclosureArrowLeftPadding() - GetDisclosureArrowRightPadding();
+  bounds.Inset(disclosure_arrow_offset, 0, 0, 0);
+
+  ui::NativeTheme::State state =
+      HasFocus() ? ui::NativeTheme::kHovered : ui::NativeTheme::kNormal;
+  GetNativeTheme()->Paint(canvas->sk_canvas(),
+                          ui::NativeTheme::kComboboxArrowBackground,
+                          state,
+                          bounds,
+                          ui::NativeTheme::ExtraParams());
+}
+
 void Combobox::ShowDropDownMenu(ui::MenuSourceType source_type) {
   gfx::Rect lb = GetLocalBounds();
   gfx::Point menu_position(lb.origin());
 
   if (style_ == STYLE_NORMAL) {
     // Inset the menu's requested position so the border of the menu lines up
     // with the border of the combobox.
     menu_position.set_x(menu_position.x() + kMenuBorderWidthLeft);
     menu_position.set_y(menu_position.y() + kMenuBorderWidthTop);
   }
@@ skipping 102 matching lines @@
   return gfx::Size(width, font_list.GetHeight());
 }
 
 PrefixSelector* Combobox::GetPrefixSelector() {
   if (!selector_)
     selector_.reset(new PrefixSelector(this));
   return selector_.get();
 }
 
 }  // namespace views