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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 ToolbarActionView::ToolbarActionView( | 55 ToolbarActionView::ToolbarActionView( |
56 ToolbarActionViewController* view_controller, | 56 ToolbarActionViewController* view_controller, |
57 ToolbarActionView::Delegate* delegate) | 57 ToolbarActionView::Delegate* delegate) |
58 : MenuButton(base::string16(), this, false), | 58 : MenuButton(base::string16(), this, false), |
59 view_controller_(view_controller), | 59 view_controller_(view_controller), |
60 delegate_(delegate), | 60 delegate_(delegate), |
61 called_register_command_(false), | 61 called_register_command_(false), |
62 wants_to_run_(false), | 62 wants_to_run_(false), |
63 menu_(nullptr), | 63 menu_(nullptr), |
64 weak_factory_(this) { | 64 weak_factory_(this) { |
65 SetHasInkDrop(ui::MaterialDesignController::IsModeMaterial()); | 65 if (ui::MaterialDesignController::IsModeMaterial()) |
| 66 SetHasInkDrop(INK_DROP_WITH_GESTURE_HANDLING); |
66 set_has_ink_drop_action_on_click(true); | 67 set_has_ink_drop_action_on_click(true); |
67 set_id(VIEW_ID_BROWSER_ACTION); | 68 set_id(VIEW_ID_BROWSER_ACTION); |
68 view_controller_->SetDelegate(this); | 69 view_controller_->SetDelegate(this); |
69 SetHorizontalAlignment(gfx::ALIGN_CENTER); | 70 SetHorizontalAlignment(gfx::ALIGN_CENTER); |
70 set_drag_controller(delegate_); | 71 set_drag_controller(delegate_); |
71 | 72 |
72 set_context_menu_controller(this); | 73 set_context_menu_controller(this); |
73 | 74 |
74 // If the button is within a menu, we need to make it focusable in order to | 75 // If the button is within a menu, we need to make it focusable in order to |
75 // have it accessible via keyboard navigation. | 76 // have it accessible via keyboard navigation. |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 if (menu_controller->in_nested_run()) { | 320 if (menu_controller->in_nested_run()) { |
320 // There is another menu showing. Close the outermost menu (since we are | 321 // There is another menu showing. Close the outermost menu (since we are |
321 // shown in the same menu, we don't want to close the whole thing). | 322 // shown in the same menu, we don't want to close the whole thing). |
322 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); | 323 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); |
323 return true; | 324 return true; |
324 } | 325 } |
325 } | 326 } |
326 | 327 |
327 return false; | 328 return false; |
328 } | 329 } |
OLD | NEW |