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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months 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/menu_gtk.h ('k') | chrome/browser/ui/gtk/nine_box.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/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/ui/gtk/gtk_custom_menu.h" 15 #include "chrome/browser/ui/gtk/gtk_custom_menu.h"
16 #include "chrome/browser/ui/gtk/gtk_custom_menu_item.h" 16 #include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
17 #include "chrome/browser/ui/gtk/gtk_util.h" 17 #include "chrome/browser/ui/gtk/gtk_util.h"
18 #include "gfx/gtk_util.h"
19 #include "third_party/skia/include/core/SkBitmap.h" 18 #include "third_party/skia/include/core/SkBitmap.h"
20 #include "ui/base/models/accelerator_gtk.h" 19 #include "ui/base/models/accelerator_gtk.h"
21 #include "ui/base/models/button_menu_item_model.h" 20 #include "ui/base/models/button_menu_item_model.h"
22 #include "ui/base/models/menu_model.h" 21 #include "ui/base/models/menu_model.h"
22 #include "ui/gfx/gtk_util.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 {
28 28
29 // Sets the ID of a menu item. 29 // Sets the ID of a menu item.
30 void SetMenuItemID(GtkWidget* menu_item, int menu_id) { 30 void SetMenuItemID(GtkWidget* menu_item, int menu_id) {
31 DCHECK_GE(menu_id, 0); 31 DCHECK_GE(menu_id, 0);
32 32
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/menu_gtk.h ('k') | chrome/browser/ui/gtk/nine_box.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698