| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_TOOLBAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 const content::NotificationSource& source, | 146 const content::NotificationSource& source, |
| 147 const content::NotificationDetails& details) OVERRIDE; | 147 const content::NotificationDetails& details) OVERRIDE; |
| 148 | 148 |
| 149 // Overridden from ui::AcceleratorProvider: | 149 // Overridden from ui::AcceleratorProvider: |
| 150 virtual bool GetAcceleratorForCommandId( | 150 virtual bool GetAcceleratorForCommandId( |
| 151 int command_id, ui::Accelerator* accelerator) OVERRIDE; | 151 int command_id, ui::Accelerator* accelerator) OVERRIDE; |
| 152 | 152 |
| 153 // Overridden from views::View: | 153 // Overridden from views::View: |
| 154 virtual gfx::Size GetPreferredSize() OVERRIDE; | 154 virtual gfx::Size GetPreferredSize() OVERRIDE; |
| 155 virtual void Layout() OVERRIDE; | 155 virtual void Layout() OVERRIDE; |
| 156 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE; | 156 virtual bool HitTestRect(const gfx::RectF& rect) const OVERRIDE; |
| 157 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 157 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
| 158 virtual void OnThemeChanged() OVERRIDE; | 158 virtual void OnThemeChanged() OVERRIDE; |
| 159 virtual const char* GetClassName() const OVERRIDE; | 159 virtual const char* GetClassName() const OVERRIDE; |
| 160 virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE; | 160 virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE; |
| 161 | 161 |
| 162 // Whether the wrench/hotdogs menu is currently showing. | 162 // Whether the wrench/hotdogs menu is currently showing. |
| 163 bool IsWrenchMenuShowing() const; | 163 bool IsWrenchMenuShowing() const; |
| 164 | 164 |
| 165 // Whether the toolbar view needs its background painted by the | 165 // Whether the toolbar view needs its background painted by the |
| 166 // BrowserNonClientFrameView. | 166 // BrowserNonClientFrameView. |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 | 255 |
| 256 // A list of listeners to call when the menu opens. | 256 // A list of listeners to call when the menu opens. |
| 257 ObserverList<views::MenuListener> menu_listeners_; | 257 ObserverList<views::MenuListener> menu_listeners_; |
| 258 | 258 |
| 259 content::NotificationRegistrar registrar_; | 259 content::NotificationRegistrar registrar_; |
| 260 | 260 |
| 261 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 261 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 262 }; | 262 }; |
| 263 | 263 |
| 264 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ | 264 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |
| OLD | NEW |