| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  144   // Overridden from content::NotificationObserver: |  144   // Overridden from content::NotificationObserver: | 
|  145   virtual void Observe(int type, |  145   virtual void Observe(int type, | 
|  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() const OVERRIDE; | 
|  155   virtual gfx::Size GetMinimumSize() OVERRIDE; |  155   virtual gfx::Size GetMinimumSize() const OVERRIDE; | 
|  156   virtual void Layout() OVERRIDE; |  156   virtual void Layout() OVERRIDE; | 
|  157   virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE; |  157   virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE; | 
|  158   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |  158   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 
|  159   virtual void OnThemeChanged() OVERRIDE; |  159   virtual void OnThemeChanged() OVERRIDE; | 
|  160   virtual const char* GetClassName() const OVERRIDE; |  160   virtual const char* GetClassName() const OVERRIDE; | 
|  161   virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE; |  161   virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE; | 
|  162  |  162  | 
|  163   // Whether the wrench/hotdogs menu is currently showing. |  163   // Whether the wrench/hotdogs menu is currently showing. | 
|  164   bool IsWrenchMenuShowing() const; |  164   bool IsWrenchMenuShowing() const; | 
|  165  |  165  | 
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  259  |  259  | 
|  260   // A list of listeners to call when the menu opens. |  260   // A list of listeners to call when the menu opens. | 
|  261   ObserverList<views::MenuListener> menu_listeners_; |  261   ObserverList<views::MenuListener> menu_listeners_; | 
|  262  |  262  | 
|  263   content::NotificationRegistrar registrar_; |  263   content::NotificationRegistrar registrar_; | 
|  264  |  264  | 
|  265   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |  265   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 
|  266 }; |  266 }; | 
|  267  |  267  | 
|  268 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |  268 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ | 
| OLD | NEW |