| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 virtual bool IsCommandIdChecked(int command_id) const; | 111 virtual bool IsCommandIdChecked(int command_id) const; |
| 112 virtual bool IsCommandIdEnabled(int command_id) const; | 112 virtual bool IsCommandIdEnabled(int command_id) const; |
| 113 virtual bool GetAcceleratorForCommandId(int command_id, | 113 virtual bool GetAcceleratorForCommandId(int command_id, |
| 114 menus::Accelerator* accelerator); | 114 menus::Accelerator* accelerator); |
| 115 virtual void ExecuteCommand(int command_id); | 115 virtual void ExecuteCommand(int command_id); |
| 116 | 116 |
| 117 // Overridden from views::View: | 117 // Overridden from views::View: |
| 118 virtual gfx::Size GetPreferredSize(); | 118 virtual gfx::Size GetPreferredSize(); |
| 119 virtual void Layout(); | 119 virtual void Layout(); |
| 120 virtual void Paint(gfx::Canvas* canvas); | 120 virtual void Paint(gfx::Canvas* canvas); |
| 121 virtual void ThemeChanged(); | 121 virtual void OnThemeChanged(); |
| 122 | 122 |
| 123 protected: | 123 protected: |
| 124 | 124 |
| 125 // Overridden from AccessibleToolbarView | 125 // Overridden from AccessibleToolbarView |
| 126 virtual views::View* GetDefaultFocusableChild(); | 126 virtual views::View* GetDefaultFocusableChild(); |
| 127 virtual void RemoveToolbarFocus(); | 127 virtual void RemoveToolbarFocus(); |
| 128 | 128 |
| 129 private: | 129 private: |
| 130 // Returns the number of pixels above the location bar in non-normal display. | 130 // Returns the number of pixels above the location bar in non-normal display. |
| 131 int PopupTopSpacing() const; | 131 int PopupTopSpacing() const; |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 | 210 |
| 211 // 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 |
| 212 // 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 |
| 213 // running. | 213 // running. |
| 214 bool* destroyed_flag_; | 214 bool* destroyed_flag_; |
| 215 | 215 |
| 216 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 216 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 217 }; | 217 }; |
| 218 | 218 |
| 219 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ | 219 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |