Chromium Code Reviews| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 152 virtual bool GetDropFormats( | 152 virtual bool GetDropFormats( |
| 153 int* formats, | 153 int* formats, |
| 154 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; | 154 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; |
| 155 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; | 155 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; |
| 156 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; | 156 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; |
| 157 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; | 157 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; |
| 158 virtual void OnThemeChanged() OVERRIDE; | 158 virtual void OnThemeChanged() OVERRIDE; |
| 159 virtual std::string GetClassName() const OVERRIDE; | 159 virtual std::string 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. | |
| 163 bool IsSettingsMenuShowing() const; | |
|
sky
2012/08/22 19:36:29
Since we use wrench menu every where, this should
Dan Beam
2012/08/22 23:10:38
OK, updated. Here's hoping I'm not the one that h
| |
| 164 | |
| 162 // The apparent horizontal space between most items, and the vertical padding | 165 // The apparent horizontal space between most items, and the vertical padding |
| 163 // above and below them. | 166 // above and below them. |
| 164 static const int kStandardSpacing; | 167 static const int kStandardSpacing; |
| 165 // 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 |
| 166 // standard spacing. | 169 // standard spacing. |
| 167 static const int kVertSpacing; | 170 static const int kVertSpacing; |
| 168 | 171 |
| 169 protected: | 172 protected: |
| 170 // Overridden from AccessiblePaneView | 173 // Overridden from AccessiblePaneView |
| 171 virtual bool SetPaneFocusAndFocusDefault() OVERRIDE; | 174 virtual bool SetPaneFocusAndFocusDefault() OVERRIDE; |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 243 | 246 |
| 244 // A list of listeners to call when the menu opens. | 247 // A list of listeners to call when the menu opens. |
| 245 ObserverList<views::MenuListener> menu_listeners_; | 248 ObserverList<views::MenuListener> menu_listeners_; |
| 246 | 249 |
| 247 content::NotificationRegistrar registrar_; | 250 content::NotificationRegistrar registrar_; |
| 248 | 251 |
| 249 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 252 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 250 }; | 253 }; |
| 251 | 254 |
| 252 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 255 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |