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

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

Unified Diff: ui/views/controls/button/text_button.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:

Index: ui/views/controls/button/text_button.cc

diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc

index 5c055efd693a8c472e6cfc3b0dd2829b5395634e..a92c539ca2420ddff1bb2b4e7f95057dc7912819 100644

--- a/ui/views/controls/button/text_button.cc

+++ b/ui/views/controls/button/text_button.cc

@@ -10,7 +10,7 @@

#include "grit/ui_resources.h"

#include "ui/base/animation/throb_animation.h"

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

-#include "ui/gfx/canvas_skia.h"

+#include "ui/gfx/canvas.h"

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

#include "ui/views/controls/button/button.h"

#include "ui/views/events/event.h"

« no previous file with comments | « ui/views/button_drag_utils.cc ('k') | ui/views/controls/glow_hover_controller.cc » ('j') | no next file with comments »