| 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 #include "views/controls/menu/native_menu_gtk.h" | 5 #include "views/controls/menu/native_menu_gtk.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/gfx/gtk_util.h" | 9 #include "app/gfx/gtk_util.h" |
| 10 #include "base/keyboard_codes.h" | 10 #include "base/keyboard_codes.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/time.h" | 12 #include "base/time.h" |
| 13 #include "third_party/skia/include/core/SkBitmap.h" | 13 #include "third_party/skia/include/core/SkBitmap.h" |
| 14 #include "views/accelerator.h" | 14 #include "views/accelerator.h" |
| 15 #include "views/controls/menu/menu_2.h" | 15 #include "views/controls/menu/menu_2.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 // Data passed to the UpdateStateCallback from gtk_container_foreach. | 18 // Data passed to the UpdateStateCallback from gtk_container_foreach. |
| 19 struct UpdateStateData { | 19 struct UpdateStateData { |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 | 237 |
| 238 //////////////////////////////////////////////////////////////////////////////// | 238 //////////////////////////////////////////////////////////////////////////////// |
| 239 // MenuWrapper, public: | 239 // MenuWrapper, public: |
| 240 | 240 |
| 241 // static | 241 // static |
| 242 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { | 242 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { |
| 243 return new NativeMenuGtk(menu->model()); | 243 return new NativeMenuGtk(menu->model()); |
| 244 } | 244 } |
| 245 | 245 |
| 246 } // namespace views | 246 } // namespace views |
| OLD | NEW |