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

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

Issue 8463009: Cleanup: Remove unneeded forward declarations from chrome/browser/ui/views. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase, no code change Created 9 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "chrome/browser/command_updater.h" 14 #include "chrome/browser/command_updater.h"
15 #include "chrome/browser/prefs/pref_member.h" 15 #include "chrome/browser/prefs/pref_member.h"
16 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" 16 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
18 #include "chrome/browser/ui/views/reload_button.h" 18 #include "chrome/browser/ui/views/reload_button.h"
19 #include "ui/base/animation/slide_animation.h" 19 #include "ui/base/animation/slide_animation.h"
20 #include "ui/base/models/accelerator.h" 20 #include "ui/base/models/accelerator.h"
21 #include "views/accessible_pane_view.h" 21 #include "views/accessible_pane_view.h"
22 #include "views/controls/button/menu_button.h" 22 #include "views/controls/button/menu_button.h"
23 #include "views/controls/menu/view_menu_delegate.h" 23 #include "views/controls/menu/view_menu_delegate.h"
24 #include "views/view.h" 24 #include "views/view.h"
25 25
26 class BrowserActionsContainer; 26 class BrowserActionsContainer;
27 class Browser; 27 class Browser;
28 class Profile;
29 class WrenchMenu; 28 class WrenchMenu;
30 29
31 namespace views { 30 namespace views {
32 class MenuListener; 31 class MenuListener;
33 } 32 }
34 33
35 // The Browser Window's toolbar. 34 // The Browser Window's toolbar.
36 class ToolbarView : public views::AccessiblePaneView, 35 class ToolbarView : public views::AccessiblePaneView,
37 public views::ViewMenuDelegate, 36 public views::ViewMenuDelegate,
38 public ui::AcceleratorProvider, 37 public ui::AcceleratorProvider,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 virtual bool AcceleratorPressed(const views::Accelerator& acc) OVERRIDE; 130 virtual bool AcceleratorPressed(const views::Accelerator& acc) OVERRIDE;
132 131
133 // The apparent horizontal space between most items, and the vertical padding 132 // The apparent horizontal space between most items, and the vertical padding
134 // above and below them. 133 // above and below them.
135 static const int kStandardSpacing; 134 static const int kStandardSpacing;
136 // The top of the toolbar has an edge we have to skip over in addition to the 135 // The top of the toolbar has an edge we have to skip over in addition to the
137 // standard spacing. 136 // standard spacing.
138 static const int kVertSpacing; 137 static const int kVertSpacing;
139 138
140 protected: 139 protected:
141
142 // Overridden from AccessiblePaneView 140 // Overridden from AccessiblePaneView
143 virtual views::View* GetDefaultFocusableChild() OVERRIDE; 141 virtual views::View* GetDefaultFocusableChild() OVERRIDE;
144 virtual void RemovePaneFocus() OVERRIDE; 142 virtual void RemovePaneFocus() OVERRIDE;
145 143
146 private: 144 private:
147 // Returns true if we should show the upgrade recommended dot. 145 // Returns true if we should show the upgrade recommended dot.
148 bool IsUpgradeRecommended(); 146 bool IsUpgradeRecommended();
149 147
150 // Returns true if we should show the background page badge. 148 // Returns true if we should show the background page badge.
151 bool ShouldShowBackgroundPageBadge(); 149 bool ShouldShowBackgroundPageBadge();
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 207
210 // A list of listeners to call when the menu opens. 208 // A list of listeners to call when the menu opens.
211 ObserverList<views::MenuListener> menu_listeners_; 209 ObserverList<views::MenuListener> menu_listeners_;
212 210
213 content::NotificationRegistrar registrar_; 211 content::NotificationRegistrar registrar_;
214 212
215 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 213 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
216 }; 214 };
217 215
218 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 216 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698