| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 // Remove a menu listener. | 73 // Remove a menu listener. |
| 74 void RemoveMenuListener(views::MenuListener* listener); | 74 void RemoveMenuListener(views::MenuListener* listener); |
| 75 | 75 |
| 76 // Accessors... | 76 // Accessors... |
| 77 Browser* browser() const { return browser_; } | 77 Browser* browser() const { return browser_; } |
| 78 BrowserActionsContainer* browser_actions() const { return browser_actions_; } | 78 BrowserActionsContainer* browser_actions() const { return browser_actions_; } |
| 79 ReloadButton* reload_button() const { return reload_; } | 79 ReloadButton* reload_button() const { return reload_; } |
| 80 LocationBarView* location_bar() const { return location_bar_; } | 80 LocationBarView* location_bar() const { return location_bar_; } |
| 81 views::MenuButton* app_menu() const { return app_menu_; } | 81 views::MenuButton* app_menu() const { return app_menu_; } |
| 82 bool collapsed() const { return collapsed_; } | |
| 83 void SetCollapsed(bool val); | |
| 84 | 82 |
| 85 // Overridden from AccessibleToolbarView | 83 // Overridden from AccessibleToolbarView |
| 86 virtual bool SetToolbarFocus(int view_storage_id, View* initial_focus); | 84 virtual bool SetToolbarFocus(int view_storage_id, View* initial_focus); |
| 87 | 85 |
| 88 // Overridden from Menu::BaseControllerDelegate: | 86 // Overridden from Menu::BaseControllerDelegate: |
| 89 virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel); | 87 virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel); |
| 90 | 88 |
| 91 // Overridden from views::MenuDelegate: | 89 // Overridden from views::MenuDelegate: |
| 92 virtual void RunMenu(views::View* source, const gfx::Point& pt); | 90 virtual void RunMenu(views::View* source, const gfx::Point& pt); |
| 93 | 91 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 // Used to post tasks to switch to the next/previous menu. | 206 // Used to post tasks to switch to the next/previous menu. |
| 209 ScopedRunnableMethodFactory<ToolbarView> method_factory_; | 207 ScopedRunnableMethodFactory<ToolbarView> method_factory_; |
| 210 | 208 |
| 211 NotificationRegistrar registrar_; | 209 NotificationRegistrar registrar_; |
| 212 | 210 |
| 213 // If non-null the destructor sets this to true. This is set to a non-null | 211 // If non-null the destructor sets this to true. This is set to a non-null |
| 214 // while the menu is showing and used to detect if the menu was deleted while | 212 // while the menu is showing and used to detect if the menu was deleted while |
| 215 // running. | 213 // running. |
| 216 bool* destroyed_flag_; | 214 bool* destroyed_flag_; |
| 217 | 215 |
| 218 // When collapsed, the toolbar is just a tiny strip, no controls are visible. | |
| 219 bool collapsed_; | |
| 220 | |
| 221 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 216 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 222 }; | 217 }; |
| 223 | 218 |
| 224 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ | 219 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |