| OLD | NEW |
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
| 2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
| 3 // LICENSE file. | 3 // LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTROLS_MENU_VIEWS_MENU_2_H_ | 5 #ifndef CONTROLS_MENU_VIEWS_MENU_2_H_ |
| 6 #define CONTROLS_MENU_VIEWS_MENU_2_H_ | 6 #define CONTROLS_MENU_VIEWS_MENU_2_H_ |
| 7 | 7 |
| 8 #include "base/gfx/native_widget_types.h" | 8 #include "app/gfx/native_widget_types.h" |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| 11 #include "views/controls/menu/menu_wrapper.h" | 11 #include "views/controls/menu/menu_wrapper.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 class Point; | 14 class Point; |
| 15 } | 15 } |
| 16 class SkBitmap; | 16 class SkBitmap; |
| 17 | 17 |
| 18 namespace views { | 18 namespace views { |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 | 144 |
| 145 // The object that actually implements the menu. | 145 // The object that actually implements the menu. |
| 146 scoped_ptr<MenuWrapper> wrapper_; | 146 scoped_ptr<MenuWrapper> wrapper_; |
| 147 | 147 |
| 148 DISALLOW_COPY_AND_ASSIGN(Menu2); | 148 DISALLOW_COPY_AND_ASSIGN(Menu2); |
| 149 }; | 149 }; |
| 150 | 150 |
| 151 } // namespace views | 151 } // namespace views |
| 152 | 152 |
| 153 #endif // CONTROLS_MENU_VIEWS_MENU_2_H_ | 153 #endif // CONTROLS_MENU_VIEWS_MENU_2_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 273017:
Move native_widget_types and gtk_native_view_id_manager from base/gfx to... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/