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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 // above and below them. | 166 // above and below them. |
167 static const int kStandardSpacing; | 167 static const int kStandardSpacing; |
168 // The top of the toolbar has an edge we have to skip over in addition to the | 168 // The top of the toolbar has an edge we have to skip over in addition to the |
169 // standard spacing. | 169 // standard spacing. |
170 static const int kVertSpacing; | 170 static const int kVertSpacing; |
171 | 171 |
172 protected: | 172 protected: |
173 // Overridden from AccessiblePaneView | 173 // Overridden from AccessiblePaneView |
174 virtual bool SetPaneFocusAndFocusDefault() OVERRIDE; | 174 virtual bool SetPaneFocusAndFocusDefault() OVERRIDE; |
175 virtual void RemovePaneFocus() OVERRIDE; | 175 virtual void RemovePaneFocus() OVERRIDE; |
| 176 virtual View* GetParentForFocusSearch(View* v) OVERRIDE; |
| 177 virtual bool ContainsForFocusSearch(View* root, const View* v) OVERRIDE; |
176 | 178 |
177 private: | 179 private: |
178 // Types of display mode this toolbar can have. | 180 // Types of display mode this toolbar can have. |
179 enum DisplayMode { | 181 enum DisplayMode { |
180 DISPLAYMODE_NORMAL, // Normal toolbar with buttons, etc. | 182 DISPLAYMODE_NORMAL, // Normal toolbar with buttons, etc. |
181 DISPLAYMODE_LOCATION // Slimline toolbar showing only compact location | 183 DISPLAYMODE_LOCATION // Slimline toolbar showing only compact location |
182 // bar, used for popups. | 184 // bar, used for popups. |
183 }; | 185 }; |
184 | 186 |
185 // Returns true if we should show the upgrade recommended dot. | 187 // Returns true if we should show the upgrade recommended dot. |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 | 245 |
244 // A list of listeners to call when the menu opens. | 246 // A list of listeners to call when the menu opens. |
245 ObserverList<views::MenuListener> menu_listeners_; | 247 ObserverList<views::MenuListener> menu_listeners_; |
246 | 248 |
247 content::NotificationRegistrar registrar_; | 249 content::NotificationRegistrar registrar_; |
248 | 250 |
249 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 251 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
250 }; | 252 }; |
251 | 253 |
252 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 254 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
OLD | NEW |