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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 LocationBarView* owner, ExtensionAction* action) OVERRIDE; | 118 LocationBarView* owner, ExtensionAction* action) OVERRIDE; |
119 virtual ContentSettingBubbleModelDelegate* | 119 virtual ContentSettingBubbleModelDelegate* |
120 GetContentSettingBubbleModelDelegate() OVERRIDE; | 120 GetContentSettingBubbleModelDelegate() OVERRIDE; |
121 virtual void ShowPageInfo(content::WebContents* web_contents, | 121 virtual void ShowPageInfo(content::WebContents* web_contents, |
122 const GURL& url, | 122 const GURL& url, |
123 const content::SSLStatus& ssl, | 123 const content::SSLStatus& ssl, |
124 bool show_history) OVERRIDE; | 124 bool show_history) OVERRIDE; |
125 virtual void OnInputInProgress(bool in_progress) OVERRIDE; | 125 virtual void OnInputInProgress(bool in_progress) OVERRIDE; |
126 | 126 |
127 // Overridden from chrome::search::SearchModelObserver: | 127 // Overridden from chrome::search::SearchModelObserver: |
128 virtual void ModeChanged(const chrome::search::Mode& mode) OVERRIDE; | 128 virtual void ModeChanged(const chrome::search::Mode& old_mode, |
| 129 const chrome::search::Mode& new_mode) OVERRIDE; |
129 | 130 |
130 // Overridden from CommandObserver: | 131 // Overridden from CommandObserver: |
131 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; | 132 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; |
132 | 133 |
133 // Overridden from views::ButtonListener: | 134 // Overridden from views::ButtonListener: |
134 virtual void ButtonPressed(views::Button* sender, | 135 virtual void ButtonPressed(views::Button* sender, |
135 const ui::Event& event) OVERRIDE; | 136 const ui::Event& event) OVERRIDE; |
136 | 137 |
137 // Overridden from content::NotificationObserver: | 138 // Overridden from content::NotificationObserver: |
138 virtual void Observe(int type, | 139 virtual void Observe(int type, |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 | 243 |
243 // A list of listeners to call when the menu opens. | 244 // A list of listeners to call when the menu opens. |
244 ObserverList<views::MenuListener> menu_listeners_; | 245 ObserverList<views::MenuListener> menu_listeners_; |
245 | 246 |
246 content::NotificationRegistrar registrar_; | 247 content::NotificationRegistrar registrar_; |
247 | 248 |
248 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 249 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
249 }; | 250 }; |
250 | 251 |
251 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 252 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
OLD | NEW |