Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1211)

Unified Diff: ui/views/controls/combobox/combobox.cc

Issue 1690543004: MacViews: Implement Full Keyboard Access. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/combobox/combobox.cc
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index fa957ef61d42ff3e56837a359519e39d0f0516ae..adaf87060a0ca0fe49d6ebcda09306deaa463d43 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -91,6 +91,7 @@ class TransparentButton : public CustomButton {
public:
TransparentButton(ButtonListener* listener)
: CustomButton(listener) {
+ SetAccessibilityFocusable(false);
tapted 2016/02/12 02:56:44 perhaps DCHECK(!IsFocusable()); after this? It's
karandeepb 2016/02/22 07:15:37 Done.
SetAnimationDuration(LabelButton::kHoverAnimationDurationMs);
}
~TransparentButton() override {}
@@ -350,7 +351,14 @@ Combobox::Combobox(ui::ComboboxModel* model)
arrow_button_(new TransparentButton(this)),
weak_ptr_factory_(this) {
ModelChanged();
+
+#if !defined(OS_MACOSX)
SetFocusable(true);
+#else
+ SetFocusable(false);
+ SetAccessibilityFocusable(true);
+#endif
+
UpdateBorder();
// Initialize the button images.
@@ -375,8 +383,6 @@ Combobox::Combobox(ui::ComboboxModel* model)
text_button_->SetVisible(true);
arrow_button_->SetVisible(true);
- text_button_->SetFocusable(false);
- arrow_button_->SetFocusable(false);
AddChildView(text_button_);
AddChildView(arrow_button_);
}

Powered by Google App Engine
This is Rietveld 408576698