views/controls/image_view.cc - Issue 7517020: First pass at removal of unneeded dependencies on skia\ext\platform_canvas.h

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: views/controls/image_view.cc

Issue 7517020: First pass at removal of unneeded dependencies on skia\ext\platform_canvas.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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

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

6	6

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

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

	9 #include "third_party/skia/include/core/SkPaint.h"

9 #include "ui/base/accessibility/accessible_view_state.h"	10 #include "ui/base/accessibility/accessible_view_state.h"

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

11 #include "ui/gfx/insets.h"	12 #include "ui/gfx/insets.h"

12	13

13 namespace views {	14 namespace views {

14	15

15 ImageView::ImageView()	16 ImageView::ImageView()

16 : image_size_set_(false),	17 : image_size_set_(false),

17 horiz_alignment_(CENTER),	18 horiz_alignment_(CENTER),

18 vert_alignment_(CENTER) {	19 vert_alignment_(CENTER) {

(...skipping 145 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164	165

165 bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {	166 bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {

166 if (tooltip_text_.empty())	167 if (tooltip_text_.empty())

167 return false;	168 return false;

168	169

169 *tooltip = GetTooltipText();	170 *tooltip = GetTooltipText();

170 return true;	171 return true;

171 }	172 }

172	173

173 } // namespace views	174 } // namespace views

OLD	NEW

« no previous file with comments | « ui/gfx/native_theme_win.cc ('k') | webkit/glue/media/video_renderer_impl.h » ('j') | no next file with comments »