Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: chrome/browser/ui/gtk/menu_gtk.cc

Issue 8695005: Move accelerator related files to ui/base/accelerators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/tabs/tab_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/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/bind.h" 9 #include "base/bind.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/ui/gtk/gtk_custom_menu.h" 16 #include "chrome/browser/ui/gtk/gtk_custom_menu.h"
17 #include "chrome/browser/ui/gtk/gtk_custom_menu_item.h" 17 #include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
18 #include "chrome/browser/ui/gtk/gtk_util.h" 18 #include "chrome/browser/ui/gtk/gtk_util.h"
19 #include "chrome/browser/ui/views/event_utils.h" 19 #include "chrome/browser/ui/views/event_utils.h"
20 #include "third_party/skia/include/core/SkBitmap.h" 20 #include "third_party/skia/include/core/SkBitmap.h"
21 #include "ui/base/models/accelerator_gtk.h" 21 #include "ui/base/accelerators/accelerator_gtk.h"
22 #include "ui/base/models/button_menu_item_model.h" 22 #include "ui/base/models/button_menu_item_model.h"
23 #include "ui/base/models/menu_model.h" 23 #include "ui/base/models/menu_model.h"
24 #include "ui/gfx/gtk_util.h" 24 #include "ui/gfx/gtk_util.h"
25 #include "webkit/glue/window_open_disposition.h" 25 #include "webkit/glue/window_open_disposition.h"
26 26
27 bool MenuGtk::block_activation_ = false; 27 bool MenuGtk::block_activation_ = false;
28 28
29 namespace { 29 namespace {
30 30
31 // Sets the ID of a menu item. 31 // Sets the ID of a menu item.
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 gtk_widget_hide(widget); 906 gtk_widget_hide(widget);
907 } 907 }
908 908
909 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)); 909 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
910 if (submenu) { 910 if (submenu) {
911 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo, 911 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
912 userdata); 912 userdata);
913 } 913 }
914 } 914 }
915 } 915 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/tabs/tab_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698