| 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 "chrome/browser/gtk/menu_gtk.h" | 5 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 12 #include "base/stl_util-inl.h" | 12 #include "base/stl_util-inl.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
| 15 #include "chrome/browser/gtk/gtk_custom_menu.h" | 15 #include "chrome/browser/ui/gtk/gtk_custom_menu.h" |
| 16 #include "chrome/browser/gtk/gtk_custom_menu_item.h" | 16 #include "chrome/browser/ui/gtk/gtk_custom_menu_item.h" |
| 17 #include "chrome/browser/gtk/gtk_util.h" | 17 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 18 #include "gfx/gtk_util.h" | 18 #include "gfx/gtk_util.h" |
| 19 #include "third_party/skia/include/core/SkBitmap.h" | 19 #include "third_party/skia/include/core/SkBitmap.h" |
| 20 #include "ui/base/models/accelerator_gtk.h" | 20 #include "ui/base/models/accelerator_gtk.h" |
| 21 #include "ui/base/models/button_menu_item_model.h" | 21 #include "ui/base/models/button_menu_item_model.h" |
| 22 #include "ui/base/models/menu_model.h" | 22 #include "ui/base/models/menu_model.h" |
| 23 #include "webkit/glue/window_open_disposition.h" | 23 #include "webkit/glue/window_open_disposition.h" |
| 24 | 24 |
| 25 bool MenuGtk::block_activation_ = false; | 25 bool MenuGtk::block_activation_ = false; |
| 26 | 26 |
| 27 namespace { | 27 namespace { |
| (...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 gtk_widget_hide(widget); | 832 gtk_widget_hide(widget); |
| 833 } | 833 } |
| 834 | 834 |
| 835 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)); | 835 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)); |
| 836 if (submenu) { | 836 if (submenu) { |
| 837 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo, | 837 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo, |
| 838 userdata); | 838 userdata); |
| 839 } | 839 } |
| 840 } | 840 } |
| 841 } | 841 } |
| OLD | NEW |