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

Side by Side Diff: views/controls/menu/menu_separator_win.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_separator_gtk.cc ('k') | views/controls/menu/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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/menu_separator.h" 5 #include "views/controls/menu/menu_separator.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <uxtheme.h> 8 #include <uxtheme.h>
9 #include <Vssym32.h> 9 #include <Vssym32.h>
10 10
11 #include "gfx/canvas_skia.h" 11 #include "ui/gfx/canvas_skia.h"
12 #include "gfx/native_theme_win.h" 12 #include "ui/gfx/native_theme_win.h"
13 #include "views/controls/menu/menu_config.h" 13 #include "views/controls/menu/menu_config.h"
14 #include "views/controls/menu/menu_item_view.h" 14 #include "views/controls/menu/menu_item_view.h"
15 15
16 namespace views { 16 namespace views {
17 17
18 void MenuSeparator::Paint(gfx::Canvas* canvas) { 18 void MenuSeparator::Paint(gfx::Canvas* canvas) {
19 const MenuConfig& config = MenuConfig::instance(); 19 const MenuConfig& config = MenuConfig::instance();
20 // The gutter is rendered before the background. 20 // The gutter is rendered before the background.
21 int start_x = 0; 21 int start_x = 0;
22 int start_y = height() / 3 + 1; // +1 makes separator centered. 22 int start_y = height() / 3 + 1; // +1 makes separator centered.
(...skipping 18 matching lines...) Expand all
41 dc, MENU_POPUPSEPARATOR, MPI_NORMAL, &separator_bounds); 41 dc, MENU_POPUPSEPARATOR, MPI_NORMAL, &separator_bounds);
42 canvas->EndPlatformPaint(); 42 canvas->EndPlatformPaint();
43 } 43 }
44 44
45 gfx::Size MenuSeparator::GetPreferredSize() { 45 gfx::Size MenuSeparator::GetPreferredSize() {
46 return gfx::Size(10, // Just in case we're the only item in a menu. 46 return gfx::Size(10, // Just in case we're the only item in a menu.
47 MenuConfig::instance().separator_height); 47 MenuConfig::instance().separator_height);
48 } 48 }
49 49
50 } // namespace views 50 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/menu_separator_gtk.cc ('k') | views/controls/menu/menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698