| 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 UI_VIEWS_CONTROLS_MENU_MENU_H_ | 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_H_ |
| 6 #define UI_VIEWS_CONTROLS_MENU_MENU_H_ | 6 #define UI_VIEWS_CONTROLS_MENU_MENU_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/string16.h" | 11 #include "base/strings/string16.h" |
| 12 #include "ui/gfx/native_widget_types.h" | 12 #include "ui/gfx/native_widget_types.h" |
| 13 #include "ui/views/views_export.h" | 13 #include "ui/views/views_export.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 class ImageSkia; | 16 class ImageSkia; |
| 17 class Point; | 17 class Point; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace ui { | 20 namespace ui { |
| 21 class Accelerator; | 21 class Accelerator; |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 | 244 |
| 245 // How this popup menu should be aligned relative to the point it is run at. | 245 // How this popup menu should be aligned relative to the point it is run at. |
| 246 AnchorPoint anchor_; | 246 AnchorPoint anchor_; |
| 247 | 247 |
| 248 DISALLOW_COPY_AND_ASSIGN(Menu); | 248 DISALLOW_COPY_AND_ASSIGN(Menu); |
| 249 }; | 249 }; |
| 250 | 250 |
| 251 } // namespace views | 251 } // namespace views |
| 252 | 252 |
| 253 #endif // UI_VIEWS_CONTROLS_MENU_MENU_H_ | 253 #endif // UI_VIEWS_CONTROLS_MENU_MENU_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 16757004:
Use a direct include of strings headers in ui/, part 3. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src