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

Side by Side Diff: views/controls/menu/native_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 | « views/controls/menu/menu_wrapper.h ('k') | views/controls/menu/native_menu_win.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) 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 "views/controls/menu/native_menu_gtk.h" 5 #include "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/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/time.h" 13 #include "base/time.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "gfx/font.h"
16 #include "gfx/gtk_util.h"
17 #include "third_party/skia/include/core/SkBitmap.h" 15 #include "third_party/skia/include/core/SkBitmap.h"
18 #include "ui/base/keycodes/keyboard_codes.h" 16 #include "ui/base/keycodes/keyboard_codes.h"
19 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" 17 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
20 #include "ui/base/models/menu_model.h" 18 #include "ui/base/models/menu_model.h"
19 #include "ui/gfx/font.h"
20 #include "ui/gfx/gtk_util.h"
21 #include "views/accelerator.h" 21 #include "views/accelerator.h"
22 #include "views/controls/menu/menu_2.h" 22 #include "views/controls/menu/menu_2.h"
23 #include "views/controls/menu/nested_dispatcher_gtk.h" 23 #include "views/controls/menu/nested_dispatcher_gtk.h"
24 24
25 #if defined(TOUCH_UI) 25 #if defined(TOUCH_UI)
26 #include "views/focus/accelerator_handler.h" 26 #include "views/focus/accelerator_handler.h"
27 #endif 27 #endif
28 28
29 namespace { 29 namespace {
30 30
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 554
555 //////////////////////////////////////////////////////////////////////////////// 555 ////////////////////////////////////////////////////////////////////////////////
556 // MenuWrapper, public: 556 // MenuWrapper, public:
557 557
558 // static 558 // static
559 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { 559 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
560 return new NativeMenuGtk(menu); 560 return new NativeMenuGtk(menu);
561 } 561 }
562 562
563 } // namespace views 563 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/menu_wrapper.h ('k') | views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698