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 "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 SetFocusable(true); | 102 SetFocusable(true); |
103 } | 103 } |
104 | 104 |
105 UpdateState(); | 105 UpdateState(); |
106 } | 106 } |
107 | 107 |
108 ToolbarActionView::~ToolbarActionView() { | 108 ToolbarActionView::~ToolbarActionView() { |
109 if (context_menu_owner == this) | 109 if (context_menu_owner == this) |
110 context_menu_owner = nullptr; | 110 context_menu_owner = nullptr; |
111 view_controller_->SetDelegate(nullptr); | 111 view_controller_->SetDelegate(nullptr); |
| 112 SetInkDropDelegate(scoped_ptr<views::InkDropDelegate>()); |
112 } | 113 } |
113 | 114 |
114 void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) { | 115 void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) { |
115 views::MenuButton::GetAccessibleState(state); | 116 views::MenuButton::GetAccessibleState(state); |
116 state->role = ui::AX_ROLE_BUTTON; | 117 state->role = ui::AX_ROLE_BUTTON; |
117 } | 118 } |
118 | 119 |
119 scoped_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder() const { | 120 scoped_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder() const { |
120 scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder(); | 121 scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder(); |
121 border->set_insets(gfx::Insets(kBorderInset, kBorderInset, | 122 border->set_insets(gfx::Insets(kBorderInset, kBorderInset, |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 if (menu_controller->in_nested_run()) { | 386 if (menu_controller->in_nested_run()) { |
386 // There is another menu showing. Close the outermost menu (since we are | 387 // There is another menu showing. Close the outermost menu (since we are |
387 // shown in the same menu, we don't want to close the whole thing). | 388 // shown in the same menu, we don't want to close the whole thing). |
388 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); | 389 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); |
389 return true; | 390 return true; |
390 } | 391 } |
391 } | 392 } |
392 | 393 |
393 return false; | 394 return false; |
394 } | 395 } |
OLD | NEW |