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

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

Issue 2001843002: Use ink drop hover for focus states on toolbar buttons and location (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: layout Created 4 years, 6 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_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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
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 ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
65 weak_factory_(this) { 64 weak_factory_(this) {
66 set_ink_drop_delegate(ink_drop_delegate_.get()); 65 set_ink_drop_delegate(
66 base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));
67 set_has_ink_drop_action_on_click(true); 67 set_has_ink_drop_action_on_click(true);
68 set_id(VIEW_ID_BROWSER_ACTION); 68 set_id(VIEW_ID_BROWSER_ACTION);
69 view_controller_->SetDelegate(this); 69 view_controller_->SetDelegate(this);
70 SetHorizontalAlignment(gfx::ALIGN_CENTER); 70 SetHorizontalAlignment(gfx::ALIGN_CENTER);
71 set_drag_controller(delegate_); 71 set_drag_controller(delegate_);
72 72
73 set_context_menu_controller(this); 73 set_context_menu_controller(this);
74 74
75 // 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
76 // have it accessible via keyboard navigation. 76 // have it accessible via keyboard navigation.
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 if (menu_controller->in_nested_run()) { 323 if (menu_controller->in_nested_run()) {
324 // There is another menu showing. Close the outermost menu (since we are 324 // There is another menu showing. Close the outermost menu (since we are
325 // shown in the same menu, we don't want to close the whole thing). 325 // shown in the same menu, we don't want to close the whole thing).
326 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST); 326 menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
327 return true; 327 return true;
328 } 328 }
329 } 329 }
330 330
331 return false; 331 return false;
332 } 332 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698