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

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

Issue 62873007: [Toolbar] Base toolbar button class with background images for button states (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Graphics from UI. Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "base/prefs/pref_member.h" 13 #include "base/prefs/pref_member.h"
14 #include "chrome/browser/command_observer.h" 14 #include "chrome/browser/command_observer.h"
15 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" 15 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
17 #include "ui/base/accelerators/accelerator.h" 17 #include "ui/base/accelerators/accelerator.h"
18 #include "ui/views/accessible_pane_view.h" 18 #include "ui/views/accessible_pane_view.h"
19 #include "ui/views/controls/button/menu_button.h" 19 #include "ui/views/controls/button/menu_button.h"
20 #include "ui/views/controls/button/menu_button_listener.h" 20 #include "ui/views/controls/button/menu_button_listener.h"
21 #include "ui/views/view.h" 21 #include "ui/views/view.h"
22 22
23 class BrowserActionsContainer; 23 class BrowserActionsContainer;
24 class Browser; 24 class Browser;
25 class HomeImageButton; 25 class HomeImageButton;
26 class ReloadButton; 26 class ReloadButton;
27 class SiteChipView;
27 class WrenchMenu; 28 class WrenchMenu;
28 class WrenchMenuModel; 29 class WrenchMenuModel;
29 class WrenchToolbarButton; 30 class WrenchToolbarButton;
30 31
31 namespace views { 32 namespace views {
32 class MenuListener; 33 class MenuListener;
33 } 34 }
34 35
35 // The Browser Window's toolbar. 36 // The Browser Window's toolbar.
36 class ToolbarView : public views::AccessiblePaneView, 37 class ToolbarView : public views::AccessiblePaneView,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 views::View* GetBookmarkBubbleAnchor(); 78 views::View* GetBookmarkBubbleAnchor();
78 79
79 // Returns the view to which the Translate bubble should be anchored. 80 // Returns the view to which the Translate bubble should be anchored.
80 views::View* GetTranslateBubbleAnchor(); 81 views::View* GetTranslateBubbleAnchor();
81 82
82 // Accessors... 83 // Accessors...
83 Browser* browser() const { return browser_; } 84 Browser* browser() const { return browser_; }
84 BrowserActionsContainer* browser_actions() const { return browser_actions_; } 85 BrowserActionsContainer* browser_actions() const { return browser_actions_; }
85 ReloadButton* reload_button() const { return reload_; } 86 ReloadButton* reload_button() const { return reload_; }
86 LocationBarView* location_bar() const { return location_bar_; } 87 LocationBarView* location_bar() const { return location_bar_; }
88 SiteChipView* site_chip() const { return site_chip_view_; }
87 views::MenuButton* app_menu() const; 89 views::MenuButton* app_menu() const;
88 90
89 // Overridden from AccessiblePaneView 91 // Overridden from AccessiblePaneView
90 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; 92 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
91 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 93 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
92 94
93 // Overridden from views::MenuButtonListener: 95 // Overridden from views::MenuButtonListener:
94 virtual void OnMenuButtonClicked(views::View* source, 96 virtual void OnMenuButtonClicked(views::View* source,
95 const gfx::Point& point) OVERRIDE; 97 const gfx::Point& point) OVERRIDE;
96 98
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 void OnShowHomeButtonChanged(); 206 void OnShowHomeButtonChanged();
205 207
206 int content_shadow_height() const; 208 int content_shadow_height() const;
207 209
208 // Controls 210 // Controls
209 views::ImageButton* back_; 211 views::ImageButton* back_;
210 views::ImageButton* forward_; 212 views::ImageButton* forward_;
211 ReloadButton* reload_; 213 ReloadButton* reload_;
212 HomeImageButton* home_; 214 HomeImageButton* home_;
213 LocationBarView* location_bar_; 215 LocationBarView* location_bar_;
216 SiteChipView* site_chip_view_;
214 BrowserActionsContainer* browser_actions_; 217 BrowserActionsContainer* browser_actions_;
215 WrenchToolbarButton* app_menu_; 218 WrenchToolbarButton* app_menu_;
216 Browser* browser_; 219 Browser* browser_;
217 220
218 // Controls whether or not a home button should be shown on the toolbar. 221 // Controls whether or not a home button should be shown on the toolbar.
219 BooleanPrefMember show_home_button_; 222 BooleanPrefMember show_home_button_;
220 223
221 // The display mode used when laying out the toolbar. 224 // The display mode used when laying out the toolbar.
222 DisplayMode display_mode_; 225 DisplayMode display_mode_;
223 226
224 // Wrench model and menu. 227 // Wrench model and menu.
225 // Note that the menu should be destroyed before the model it uses, so the 228 // Note that the menu should be destroyed before the model it uses, so the
226 // menu should be listed later. 229 // menu should be listed later.
227 scoped_ptr<WrenchMenuModel> wrench_menu_model_; 230 scoped_ptr<WrenchMenuModel> wrench_menu_model_;
228 scoped_ptr<WrenchMenu> wrench_menu_; 231 scoped_ptr<WrenchMenu> wrench_menu_;
229 232
230 // A list of listeners to call when the menu opens. 233 // A list of listeners to call when the menu opens.
231 ObserverList<views::MenuListener> menu_listeners_; 234 ObserverList<views::MenuListener> menu_listeners_;
232 235
233 content::NotificationRegistrar registrar_; 236 content::NotificationRegistrar registrar_;
234 237
235 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 238 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
236 }; 239 };
237 240
238 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 241 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698