| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "ui/views/controls/menu/native_menu_gtk.h" | 5 #include "ui/views/controls/menu/native_menu_gtk.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/i18n/rtl.h" | 12 #include "base/i18n/rtl.h" |
| 13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
| 14 #include "base/time.h" | 14 #include "base/time.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "third_party/skia/include/core/SkBitmap.h" | 16 #include "third_party/skia/include/core/SkBitmap.h" |
| 17 #include "ui/base/accelerators/accelerator.h" | 17 #include "ui/base/accelerators/accelerator.h" |
| 18 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" | 18 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" |
| 19 #include "ui/base/keycodes/keyboard_codes.h" | 19 #include "ui/base/keycodes/keyboard_codes.h" |
| 20 #include "ui/base/models/menu_model.h" | 20 #include "ui/base/models/menu_model.h" |
| 21 #include "ui/gfx/font.h" | 21 #include "ui/gfx/font.h" |
| 22 #include "ui/gfx/gtk_util.h" | 22 #include "ui/gfx/gtk_util.h" |
| 23 #include "ui/views/controls/menu/menu_2.h" | 23 #include "ui/views/controls/menu/menu_2.h" |
| 24 #include "ui/views/controls/menu/menu_listener.h" | 24 #include "ui/views/controls/menu/menu_listener.h" |
| 25 #include "ui/views/controls/menu/nested_dispatcher_gtk.h" | 25 #include "ui/views/controls/menu/nested_dispatcher_gtk.h" |
| 26 #include "ui/views/views_delegate.h" |
| 26 #include "ui/views/widget/native_widget_gtk.h" | 27 #include "ui/views/widget/native_widget_gtk.h" |
| 27 #include "views/views_delegate.h" | |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 const char kPositionString[] = "position"; | 31 const char kPositionString[] = "position"; |
| 32 const char kAccelGroupString[] = "accel_group"; | 32 const char kAccelGroupString[] = "accel_group"; |
| 33 | 33 |
| 34 // Key for the property set on the gtk menu that gives the handle to the hosting | 34 // Key for the property set on the gtk menu that gives the handle to the hosting |
| 35 // NativeMenuGtk. | 35 // NativeMenuGtk. |
| 36 const char kNativeMenuGtkString[] = "native_menu_gtk"; | 36 const char kNativeMenuGtkString[] = "native_menu_gtk"; |
| 37 | 37 |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 | 619 |
| 620 //////////////////////////////////////////////////////////////////////////////// | 620 //////////////////////////////////////////////////////////////////////////////// |
| 621 // MenuWrapper, public: | 621 // MenuWrapper, public: |
| 622 | 622 |
| 623 // static | 623 // static |
| 624 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { | 624 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { |
| 625 return new NativeMenuGtk(menu); | 625 return new NativeMenuGtk(menu); |
| 626 } | 626 } |
| 627 | 627 |
| 628 } // namespace views | 628 } // namespace views |
| OLD | NEW |