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

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

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gtk/menu_gtk.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "app/menus/accelerator_gtk.h" 9 #include "app/menus/accelerator_gtk.h"
10 #include "app/menus/button_menu_item_model.h" 10 #include "app/menus/button_menu_item_model.h"
11 #include "app/menus/menu_model.h" 11 #include "app/menus/menu_model.h"
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/stl_util-inl.h" 15 #include "base/stl_util-inl.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/app/chrome_dll_resource.h" 17 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/gtk/gtk_custom_menu.h" 18 #include "chrome/browser/gtk/gtk_custom_menu.h"
19 #include "chrome/browser/gtk/gtk_custom_menu_item.h" 19 #include "chrome/browser/gtk/gtk_custom_menu_item.h"
20 #include "chrome/browser/gtk/gtk_util.h" 20 #include "chrome/browser/gtk/gtk_util.h"
21 #include "gfx/gtk_util.h" 21 #include "gfx/gtk_util.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
23 23
24 bool MenuGtk::block_activation_ = false; 24 bool MenuGtk::block_activation_ = false;
25 25
26 namespace { 26 namespace {
27 27
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 gtk_widget_hide(widget); 790 gtk_widget_hide(widget);
791 } 791 }
792 792
793 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)); 793 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
794 if (submenu) { 794 if (submenu) {
795 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo, 795 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
796 userdata); 796 userdata);
797 } 797 }
798 } 798 }
799 } 799 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698