OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_VIEWS_TOOLBAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ |
6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ | 6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/ref_counted.h" | 10 #include "base/ref_counted.h" |
11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
12 #include "chrome/browser/back_forward_menu_model_win.h" | |
13 #include "chrome/browser/command_updater.h" | 12 #include "chrome/browser/command_updater.h" |
14 #include "chrome/browser/encoding_menu_controller_delegate.h" | 13 #include "chrome/browser/encoding_menu_controller_delegate.h" |
15 #include "chrome/browser/user_data_manager.h" | 14 #include "chrome/browser/user_data_manager.h" |
16 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" | 15 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" |
17 #include "chrome/browser/views/go_button.h" | 16 #include "chrome/browser/views/go_button.h" |
18 #include "chrome/browser/views/location_bar_view.h" | 17 #include "chrome/browser/views/location_bar_view.h" |
19 #include "chrome/common/pref_member.h" | 18 #include "chrome/common/pref_member.h" |
20 #include "views/controls/button/menu_button.h" | 19 #include "views/controls/button/menu_button.h" |
21 #include "views/controls/menu/menu.h" | 20 #include "views/controls/menu/menu.h" |
22 #include "views/controls/menu/view_menu_delegate.h" | 21 #include "views/controls/menu/view_menu_delegate.h" |
23 #include "views/view.h" | 22 #include "views/view.h" |
24 | 23 |
| 24 class BackForwardMenuModelViews; |
25 class Browser; | 25 class Browser; |
26 class Profile; | 26 class Profile; |
27 class ToolbarStarToggle; | 27 class ToolbarStarToggle; |
28 | 28 |
29 /////////////////////////////////////////////////////////////////////////////// | 29 /////////////////////////////////////////////////////////////////////////////// |
30 // | 30 // |
31 // BrowserToolbarView class | 31 // BrowserToolbarView class |
32 // | 32 // |
33 // The BrowserToolbarView is responsible for constructing the content of and | 33 // The BrowserToolbarView is responsible for constructing the content of and |
34 // rendering the Toolbar used in the Browser Window | 34 // rendering the Toolbar used in the Browser Window |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 | 164 |
165 // Overridden from View, to pass keyboard triggering of the right-click | 165 // Overridden from View, to pass keyboard triggering of the right-click |
166 // context menu on to the toolbar child view that currently has the | 166 // context menu on to the toolbar child view that currently has the |
167 // accessibility focus. | 167 // accessibility focus. |
168 virtual void ShowContextMenu(int x, int y, bool is_mouse_gesture); | 168 virtual void ShowContextMenu(int x, int y, bool is_mouse_gesture); |
169 | 169 |
170 bool IsDisplayModeNormal() const { | 170 bool IsDisplayModeNormal() const { |
171 return display_mode_ == DISPLAYMODE_NORMAL; | 171 return display_mode_ == DISPLAYMODE_NORMAL; |
172 } | 172 } |
173 | 173 |
174 scoped_ptr<BackForwardMenuModelWin> back_menu_model_; | 174 scoped_ptr<BackForwardMenuModelViews> back_menu_model_; |
175 scoped_ptr<BackForwardMenuModelWin> forward_menu_model_; | 175 scoped_ptr<BackForwardMenuModelViews> forward_menu_model_; |
176 | 176 |
177 // The model that contains the security level, text, icon to display... | 177 // The model that contains the security level, text, icon to display... |
178 ToolbarModel* model_; | 178 ToolbarModel* model_; |
179 | 179 |
180 // Storage of strings needed for accessibility. | 180 // Storage of strings needed for accessibility. |
181 std::wstring accessible_name_; | 181 std::wstring accessible_name_; |
182 // Child view currently having MSAA focus (location bar excluded from arrow | 182 // Child view currently having MSAA focus (location bar excluded from arrow |
183 // navigation). | 183 // navigation). |
184 views::View* acc_focused_view_; | 184 views::View* acc_focused_view_; |
185 | 185 |
(...skipping 22 matching lines...) Expand all Loading... |
208 scoped_refptr<GetProfilesHelper> profiles_helper_; | 208 scoped_refptr<GetProfilesHelper> profiles_helper_; |
209 | 209 |
210 // Controls whether or not a home button should be shown on the toolbar. | 210 // Controls whether or not a home button should be shown on the toolbar. |
211 BooleanPrefMember show_home_button_; | 211 BooleanPrefMember show_home_button_; |
212 | 212 |
213 // The display mode used when laying out the toolbar. | 213 // The display mode used when laying out the toolbar. |
214 DisplayMode display_mode_; | 214 DisplayMode display_mode_; |
215 }; | 215 }; |
216 | 216 |
217 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ | 217 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ |
OLD | NEW |