OLD | NEW |
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_action_view.h" | 5 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 // destroyed. | 88 // destroyed. |
89 set_ink_drop_delegate(nullptr); | 89 set_ink_drop_delegate(nullptr); |
90 view_controller_->SetDelegate(nullptr); | 90 view_controller_->SetDelegate(nullptr); |
91 } | 91 } |
92 | 92 |
93 void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) { | 93 void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) { |
94 views::MenuButton::GetAccessibleState(state); | 94 views::MenuButton::GetAccessibleState(state); |
95 state->role = ui::AX_ROLE_BUTTON; | 95 state->role = ui::AX_ROLE_BUTTON; |
96 } | 96 } |
97 | 97 |
98 scoped_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder() const { | 98 std::unique_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder() |
99 scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder(); | 99 const { |
| 100 std::unique_ptr<LabelButtonBorder> border = |
| 101 LabelButton::CreateDefaultBorder(); |
100 border->set_insets(gfx::Insets(kBorderInset, kBorderInset, | 102 border->set_insets(gfx::Insets(kBorderInset, kBorderInset, |
101 kBorderInset, kBorderInset)); | 103 kBorderInset, kBorderInset)); |
102 return border; | 104 return border; |
103 } | 105 } |
104 | 106 |
105 bool ToolbarActionView::IsTriggerableEvent(const ui::Event& event) { | 107 bool ToolbarActionView::IsTriggerableEvent(const ui::Event& event) { |
106 return views::MenuButton::IsTriggerableEvent(event) && | 108 return views::MenuButton::IsTriggerableEvent(event) && |
107 (base::TimeTicks::Now() - popup_closed_time_).InMilliseconds() > | 109 (base::TimeTicks::Now() - popup_closed_time_).InMilliseconds() > |
108 views::kMinimumMsBetweenButtonClicks; | 110 views::kMinimumMsBetweenButtonClicks; |
109 } | 111 } |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 if (menu_controller->in_nested_run()) { | 326 if (menu_controller->in_nested_run()) { |
325 // There is another menu showing. Close the outermost menu (since we are | 327 // There is another menu showing. Close the outermost menu (since we are |
326 // shown in the same menu, we don't want to close the whole thing). | 328 // shown in the same menu, we don't want to close the whole thing). |
327 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); | 329 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); |
328 return true; | 330 return true; |
329 } | 331 } |
330 } | 332 } |
331 | 333 |
332 return false; | 334 return false; |
333 } | 335 } |
OLD | NEW |