| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 const NotificationDetails& details); | 112 const NotificationDetails& details); |
| 113 | 113 |
| 114 // Overridden from ui::AcceleratorProvider: | 114 // Overridden from ui::AcceleratorProvider: |
| 115 virtual bool GetAcceleratorForCommandId(int command_id, | 115 virtual bool GetAcceleratorForCommandId(int command_id, |
| 116 ui::Accelerator* accelerator); | 116 ui::Accelerator* accelerator); |
| 117 | 117 |
| 118 // Overridden from views::View: | 118 // Overridden from views::View: |
| 119 virtual gfx::Size GetPreferredSize(); | 119 virtual gfx::Size GetPreferredSize(); |
| 120 virtual void Layout(); | 120 virtual void Layout(); |
| 121 virtual void Paint(gfx::Canvas* canvas); | 121 virtual void Paint(gfx::Canvas* canvas); |
| 122 virtual bool CanDrop(const ui::OSExchangeData& data); |
| 123 virtual int OnDragUpdated(const views::DropTargetEvent& event); |
| 124 virtual int OnPerformDrop(const views::DropTargetEvent& event); |
| 122 virtual void OnThemeChanged(); | 125 virtual void OnThemeChanged(); |
| 123 | 126 |
| 124 // The apparent horizontal space between most items, and the vertical padding | 127 // The apparent horizontal space between most items, and the vertical padding |
| 125 // above and below them. | 128 // above and below them. |
| 126 static const int kStandardSpacing; | 129 static const int kStandardSpacing; |
| 127 // The top of the toolbar has an edge we have to skip over in addition to the | 130 // The top of the toolbar has an edge we have to skip over in addition to the |
| 128 // standard spacing. | 131 // standard spacing. |
| 129 static const int kVertSpacing; | 132 static const int kVertSpacing; |
| 130 | 133 |
| 131 protected: | 134 protected: |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 | 225 |
| 223 // If non-null the destructor sets this to true. This is set to a non-null | 226 // If non-null the destructor sets this to true. This is set to a non-null |
| 224 // while the menu is showing and used to detect if the menu was deleted while | 227 // while the menu is showing and used to detect if the menu was deleted while |
| 225 // running. | 228 // running. |
| 226 bool* destroyed_flag_; | 229 bool* destroyed_flag_; |
| 227 | 230 |
| 228 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 231 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 229 }; | 232 }; |
| 230 | 233 |
| 231 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 234 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |