views: make comboboxes request focus when clicked

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 113 matching lines @@
 
     if (UseMd()) {
       SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                                 : InkDropMode::OFF);
       set_has_ink_drop_action_on_click(true);
     }
   }
   ~TransparentButton() override {}
 
   bool OnMousePressed(const ui::MouseEvent& mouse_event) override {
-    if (!UseMd())
-      parent()->RequestFocus();
+#if !defined(OS_MACOSX)
+    // On Mac, comboboxes do not take focus on mouse click, but on other
+    // platforms they do.
+    parent()->RequestFocus();
+#endif
     return CustomButton::OnMousePressed(mouse_event);
   }
 
   double GetAnimationValue() const {
     return hover_animation().GetCurrentValue();
   }
 
   // Overridden from InkDropHost:
   std::unique_ptr<InkDrop> CreateInkDrop() override {
     std::unique_ptr<views::InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
@@ skipping 867 matching lines @@
   const int kMdPaddingWidth = 8;
   int arrow_pad = UseMd() ? kMdPaddingWidth
                           : PlatformStyle::kComboboxNormalArrowPadding;
   int padding = style_ == STYLE_NORMAL
                     ? arrow_pad * 2
                     : kActionLeftPadding + kActionRightPadding;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views