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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_view.h

Issue 1518543002: Adds MD ink ripple animations to buttons within location bar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds MD ink ripple animations to buttons within location bar (reverted a bad change) Created 4 years, 10 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 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
11 #include "base/prefs/pref_member.h" 11 #include "base/prefs/pref_member.h"
12 #include "chrome/browser/command_observer.h" 12 #include "chrome/browser/command_observer.h"
13 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h" 13 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
14 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" 14 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
16 #include "ui/base/accelerators/accelerator.h" 16 #include "ui/base/accelerators/accelerator.h"
17 #include "ui/views/accessible_pane_view.h" 17 #include "ui/views/accessible_pane_view.h"
18 #include "ui/views/controls/button/menu_button.h" 18 #include "ui/views/controls/button/menu_button.h"
19 #include "ui/views/controls/button/menu_button_listener.h" 19 #include "ui/views/controls/button/menu_button_listener.h"
20 #include "ui/views/view.h" 20 #include "ui/views/view.h"
21 #include "ui/views/widget/widget_observer_view.h"
21 22
22 class AppMenuButton; 23 class AppMenuButton;
23 class BackButton; 24 class BackButton;
24 class Browser; 25 class Browser;
25 class BrowserActionsContainer; 26 class BrowserActionsContainer;
26 class HomeButton; 27 class HomeButton;
27 class ReloadButton; 28 class ReloadButton;
28 class ToolbarButton; 29 class ToolbarButton;
29 30
30 namespace extensions { 31 namespace extensions {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // focus initially set to the app menu. Focus will be restored 67 // focus initially set to the app menu. Focus will be restored
67 // to the last focused view if the user escapes. 68 // to the last focused view if the user escapes.
68 void SetPaneFocusAndFocusAppMenu(); 69 void SetPaneFocusAndFocusAppMenu();
69 70
70 // Returns true if the app menu is focused. 71 // Returns true if the app menu is focused.
71 bool IsAppMenuFocused(); 72 bool IsAppMenuFocused();
72 73
73 virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel); 74 virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel);
74 75
75 // Returns the view to which the bookmark bubble should be anchored. 76 // Returns the view to which the bookmark bubble should be anchored.
76 views::View* GetBookmarkBubbleAnchor(); 77 views::WidgetObserverView* GetBookmarkBubbleAnchor();
77 78
78 // Returns the view to which the "Save credit card" bubble should be anchored. 79 // Returns the view to which the "Save credit card" bubble should be anchored.
79 views::View* GetSaveCreditCardBubbleAnchor(); 80 views::WidgetObserverView* GetSaveCreditCardBubbleAnchor();
80 81
81 // Returns the view to which the Translate bubble should be anchored. 82 // Returns the view to which the Translate bubble should be anchored.
82 views::View* GetTranslateBubbleAnchor(); 83 views::WidgetObserverView* GetTranslateBubbleAnchor();
83 84
84 // Executes |command| registered by |extension|. 85 // Executes |command| registered by |extension|.
85 void ExecuteExtensionCommand(const extensions::Extension* extension, 86 void ExecuteExtensionCommand(const extensions::Extension* extension,
86 const extensions::Command& command); 87 const extensions::Command& command);
87 88
88 // Returns the maximum width the browser actions container can have. 89 // Returns the maximum width the browser actions container can have.
89 int GetMaxBrowserActionsWidth() const; 90 int GetMaxBrowserActionsWidth() const;
90 91
91 // Accessors. 92 // Accessors.
92 Browser* browser() const { return browser_; } 93 Browser* browser() const { return browser_; }
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 220
220 // The display mode used when laying out the toolbar. 221 // The display mode used when laying out the toolbar.
221 DisplayMode display_mode_; 222 DisplayMode display_mode_;
222 223
223 content::NotificationRegistrar registrar_; 224 content::NotificationRegistrar registrar_;
224 225
225 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 226 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
226 }; 227 };
227 228
228 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 229 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698