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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_button.cc

Issue 1898633004: Views: Add new SetFocusBehavior method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" 5 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
(...skipping 29 matching lines...) Expand all
40 ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)), 40 ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
41 show_menu_factory_(this) { 41 show_menu_factory_(this) {
42 set_ink_drop_delegate(ink_drop_delegate_.get()); 42 set_ink_drop_delegate(ink_drop_delegate_.get());
43 set_has_ink_drop_action_on_click(true); 43 set_has_ink_drop_action_on_click(true);
44 set_context_menu_controller(this); 44 set_context_menu_controller(this);
45 } 45 }
46 46
47 ToolbarButton::~ToolbarButton() {} 47 ToolbarButton::~ToolbarButton() {}
48 48
49 void ToolbarButton::Init() { 49 void ToolbarButton::Init() {
50 SetFocusable(false); 50 SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
51 SetAccessibilityFocusable(true);
52 image()->EnableCanvasFlippingForRTLUI(true); 51 image()->EnableCanvasFlippingForRTLUI(true);
53 } 52 }
54 53
55 void ToolbarButton::ClearPendingMenu() { 54 void ToolbarButton::ClearPendingMenu() {
56 show_menu_factory_.InvalidateWeakPtrs(); 55 show_menu_factory_.InvalidateWeakPtrs();
57 } 56 }
58 57
59 bool ToolbarButton::IsMenuShowing() const { 58 bool ToolbarButton::IsMenuShowing() const {
60 return menu_showing_; 59 return menu_showing_;
61 } 60 }
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 if (state() != STATE_DISABLED) 253 if (state() != STATE_DISABLED)
255 SetState(STATE_NORMAL); 254 SetState(STATE_NORMAL);
256 255
257 menu_runner_.reset(); 256 menu_runner_.reset();
258 menu_model_adapter_.reset(); 257 menu_model_adapter_.reset();
259 } 258 }
260 259
261 const char* ToolbarButton::GetClassName() const { 260 const char* ToolbarButton::GetClassName() const {
262 return "ToolbarButton"; 261 return "ToolbarButton";
263 } 262 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.cc ('k') | chrome/browser/ui/views/website_settings/chosen_object_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698