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

Side by Side Diff: views/controls/menu/menu_item_view_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
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/menu_item_view.h" 5 #include "views/controls/menu/menu_item_view.h"
6 6
7 #include <uxtheme.h> 7 #include <uxtheme.h>
8 #include <Vssym32.h> 8 #include <Vssym32.h>
9 9
10 #include "gfx/canvas_skia.h"
11 #include "gfx/native_theme_win.h"
12 #include "grit/app_strings.h" 10 #include "grit/app_strings.h"
11 #include "ui/gfx/canvas_skia.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/submenu_view.h" 14 #include "views/controls/menu/submenu_view.h"
15 15
16 using gfx::NativeTheme; 16 using gfx::NativeTheme;
17 17
18 namespace views { 18 namespace views {
19 19
20 gfx::Size MenuItemView::GetPreferredSize() { 20 gfx::Size MenuItemView::GetPreferredSize() {
21 const gfx::Font& font = MenuConfig::instance().font; 21 const gfx::Font& font = MenuConfig::instance().font;
22 return gfx::Size( 22 return gfx::Size(
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 // And the check. 162 // And the check.
163 gfx::Rect icon_bounds(icon_x / 2, icon_y, icon_width, icon_height); 163 gfx::Rect icon_bounds(icon_x / 2, icon_y, icon_width, icon_height);
164 AdjustBoundsForRTLUI(&icon_bounds); 164 AdjustBoundsForRTLUI(&icon_bounds);
165 RECT icon_rect = icon_bounds.ToRECT(); 165 RECT icon_rect = icon_bounds.ToRECT();
166 NativeTheme::instance()->PaintMenuCheck( 166 NativeTheme::instance()->PaintMenuCheck(
167 NativeTheme::MENU, dc, MENU_POPUPCHECK, state_id, &icon_rect, 167 NativeTheme::MENU, dc, MENU_POPUPCHECK, state_id, &icon_rect,
168 control_state); 168 control_state);
169 } 169 }
170 170
171 } // namespace views 171 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/menu/menu_item_view_gtk.cc ('k') | views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698