ui/views/controls/menu/menu_item_view_views.cc - Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/controls/menu/menu_item_view_views.cc

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more two win fixes Created 8 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 | « ui/views/controls/menu/menu_controller.cc ('k') | ui/views/controls/menu/menu_item_view_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_item_view.h"	5 #include "ui/views/controls/menu/menu_item_view.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "grit/ui_resources.h"	8 #include "grit/ui_resources.h"

9 #include "third_party/skia/include/effects/SkGradientShader.h"	9 #include "third_party/skia/include/effects/SkGradientShader.h"

10 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

11 #include "ui/gfx/canvas_skia.h"	11 #include "ui/gfx/canvas.h"

12 #include "ui/gfx/favicon_size.h"	12 #include "ui/gfx/favicon_size.h"

13 #include "ui/gfx/image/image.h"	13 #include "ui/gfx/image/image.h"

14 #include "ui/gfx/native_theme.h"	14 #include "ui/gfx/native_theme.h"

15 #include "ui/views/controls/menu/menu_config.h"	15 #include "ui/views/controls/menu/menu_config.h"

16 #include "ui/views/controls/menu/menu_image_util.h"	16 #include "ui/views/controls/menu/menu_image_util.h"

17 #include "ui/views/controls/menu/submenu_view.h"	17 #include "ui/views/controls/menu/submenu_view.h"

18	18

19 namespace views {	19 namespace views {

20	20

21 void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {	21 void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {

(...skipping 78 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 top_margin + (available_height -	100 top_margin + (available_height -

101 config.arrow_width) / 2,	101 config.arrow_width) / 2,

102 config.arrow_width, height());	102 config.arrow_width, height());

103 AdjustBoundsForRTLUI(&arrow_bounds);	103 AdjustBoundsForRTLUI(&arrow_bounds);

104 canvas->DrawBitmapInt(*GetSubmenuArrowImage(),	104 canvas->DrawBitmapInt(*GetSubmenuArrowImage(),

105 arrow_bounds.x(), arrow_bounds.y());	105 arrow_bounds.x(), arrow_bounds.y());

106 }	106 }

107 }	107 }

108	108

109 } // namespace views	109 } // namespace views

OLD	NEW