| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 } | 40 } |
| 41 | 41 |
| 42 // The Browser Window's toolbar. | 42 // The Browser Window's toolbar. |
| 43 class ToolbarView : public views::AccessiblePaneView, | 43 class ToolbarView : public views::AccessiblePaneView, |
| 44 public views::MenuButtonListener, | 44 public views::MenuButtonListener, |
| 45 public ui::AcceleratorProvider, | 45 public ui::AcceleratorProvider, |
| 46 public LocationBarView::Delegate, | 46 public LocationBarView::Delegate, |
| 47 public chrome::search::SearchModelObserver, | 47 public chrome::search::SearchModelObserver, |
| 48 public content::NotificationObserver, | 48 public content::NotificationObserver, |
| 49 public CommandObserver, | 49 public CommandObserver, |
| 50 public views::ButtonListener { | 50 public views::ButtonListener, |
| 51 public views::WidgetObserver { |
| 51 public: | 52 public: |
| 52 // The view class name. | 53 // The view class name. |
| 53 static const char kViewClassName[]; | 54 static const char kViewClassName[]; |
| 54 | 55 |
| 55 explicit ToolbarView(Browser* browser); | 56 explicit ToolbarView(Browser* browser); |
| 56 virtual ~ToolbarView(); | 57 virtual ~ToolbarView(); |
| 57 | 58 |
| 58 // Create the contents of the Browser Toolbar. |location_bar_parent| is the | 59 // Create the contents of the Browser Toolbar. |location_bar_parent| is the |
| 59 // view the LocationBarContainer is added to. |popup_parent_view| is the | 60 // view the LocationBarContainer is added to. |popup_parent_view| is the |
| 60 // View to add the omnibox popup view to. | 61 // View to add the omnibox popup view to. |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 virtual void ModeChanged(const chrome::search::Mode& old_mode, | 130 virtual void ModeChanged(const chrome::search::Mode& old_mode, |
| 130 const chrome::search::Mode& new_mode) OVERRIDE; | 131 const chrome::search::Mode& new_mode) OVERRIDE; |
| 131 | 132 |
| 132 // Overridden from CommandObserver: | 133 // Overridden from CommandObserver: |
| 133 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; | 134 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; |
| 134 | 135 |
| 135 // Overridden from views::ButtonListener: | 136 // Overridden from views::ButtonListener: |
| 136 virtual void ButtonPressed(views::Button* sender, | 137 virtual void ButtonPressed(views::Button* sender, |
| 137 const ui::Event& event) OVERRIDE; | 138 const ui::Event& event) OVERRIDE; |
| 138 | 139 |
| 140 // Overridden from views::WidgetObserver: |
| 141 virtual void OnWidgetVisibilityChanged(views::Widget* widget, |
| 142 bool visible) OVERRIDE; |
| 143 |
| 139 // Overridden from content::NotificationObserver: | 144 // Overridden from content::NotificationObserver: |
| 140 virtual void Observe(int type, | 145 virtual void Observe(int type, |
| 141 const content::NotificationSource& source, | 146 const content::NotificationSource& source, |
| 142 const content::NotificationDetails& details) OVERRIDE; | 147 const content::NotificationDetails& details) OVERRIDE; |
| 143 | 148 |
| 144 // Overridden from ui::AcceleratorProvider: | 149 // Overridden from ui::AcceleratorProvider: |
| 145 virtual bool GetAcceleratorForCommandId( | 150 virtual bool GetAcceleratorForCommandId( |
| 146 int command_id, ui::Accelerator* accelerator) OVERRIDE; | 151 int command_id, ui::Accelerator* accelerator) OVERRIDE; |
| 147 | 152 |
| 148 // Overridden from views::View: | 153 // Overridden from views::View: |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 | 255 |
| 251 // A list of listeners to call when the menu opens. | 256 // A list of listeners to call when the menu opens. |
| 252 ObserverList<views::MenuListener> menu_listeners_; | 257 ObserverList<views::MenuListener> menu_listeners_; |
| 253 | 258 |
| 254 content::NotificationRegistrar registrar_; | 259 content::NotificationRegistrar registrar_; |
| 255 | 260 |
| 256 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 261 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 257 }; | 262 }; |
| 258 | 263 |
| 259 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 264 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |