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

Side by Side Diff: views/controls/menu/submenu_view.cc

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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/native_menu_win.cc ('k') | views/controls/native/native_view_host.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/submenu_view.h" 5 #include "views/controls/menu/submenu_view.h"
6 6
7 #include "app/gfx/canvas.h" 7 #include "gfx/canvas.h"
8 #include "views/controls/menu/menu_controller.h" 8 #include "views/controls/menu/menu_controller.h"
9 #include "views/controls/menu/menu_scroll_view_container.h" 9 #include "views/controls/menu/menu_scroll_view_container.h"
10 #include "views/widget/root_view.h" 10 #include "views/widget/root_view.h"
11 11
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "views/controls/menu/menu_host_win.h" 13 #include "views/controls/menu/menu_host_win.h"
14 #elif defined(OS_LINUX) 14 #elif defined(OS_LINUX)
15 #include "views/controls/menu/menu_host_gtk.h" 15 #include "views/controls/menu/menu_host_gtk.h"
16 #endif 16 #endif
17 17
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 item_bounds.set_height(kDropIndicatorHeight); 325 item_bounds.set_height(kDropIndicatorHeight);
326 return item_bounds; 326 return item_bounds;
327 327
328 default: 328 default:
329 // Don't render anything for on. 329 // Don't render anything for on.
330 return gfx::Rect(); 330 return gfx::Rect();
331 } 331 }
332 } 332 }
333 333
334 } // namespace views 334 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/native_menu_win.cc ('k') | views/controls/native/native_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698