| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/menus/simple_menu_model.h" | 10 #include "app/menus/simple_menu_model.h" |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 | 181 |
| 182 // Controls | 182 // Controls |
| 183 views::ImageButton* back_; | 183 views::ImageButton* back_; |
| 184 views::ImageButton* forward_; | 184 views::ImageButton* forward_; |
| 185 views::ImageButton* home_; | 185 views::ImageButton* home_; |
| 186 ReloadButton* reload_; | 186 ReloadButton* reload_; |
| 187 LocationBarView* location_bar_; | 187 LocationBarView* location_bar_; |
| 188 BrowserActionsContainer* browser_actions_; | 188 BrowserActionsContainer* browser_actions_; |
| 189 views::MenuButton* page_menu_; | 189 views::MenuButton* page_menu_; |
| 190 views::MenuButton* app_menu_; | 190 views::MenuButton* app_menu_; |
| 191 // The bookmark menu button. This may be null. | |
| 192 views::MenuButton* bookmark_menu_; | |
| 193 Profile* profile_; | 191 Profile* profile_; |
| 194 Browser* browser_; | 192 Browser* browser_; |
| 195 | 193 |
| 196 // Contents of the profiles menu to populate with profile names. | 194 // Contents of the profiles menu to populate with profile names. |
| 197 scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_; | 195 scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_; |
| 198 | 196 |
| 199 // Controls whether or not a home button should be shown on the toolbar. | 197 // Controls whether or not a home button should be shown on the toolbar. |
| 200 BooleanPrefMember show_home_button_; | 198 BooleanPrefMember show_home_button_; |
| 201 | 199 |
| 202 // The display mode used when laying out the toolbar. | 200 // The display mode used when laying out the toolbar. |
| (...skipping 30 matching lines...) Expand all Loading... |
| 233 // running. | 231 // running. |
| 234 bool* destroyed_flag_; | 232 bool* destroyed_flag_; |
| 235 | 233 |
| 236 // When collapsed, the toolbar is just a tiny strip, no controls are visible. | 234 // When collapsed, the toolbar is just a tiny strip, no controls are visible. |
| 237 bool collapsed_; | 235 bool collapsed_; |
| 238 | 236 |
| 239 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 237 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 240 }; | 238 }; |
| 241 | 239 |
| 242 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ | 240 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |