chrome/browser/ui/views/location_bar/content_setting_image_view.h - 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: chrome/browser/ui/views/location_bar/content_setting_image_view.h

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

Patch Set: more fixes Created 8 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:

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h

diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h

index 58c6e5fe3304ff527e66c404c05d18616663a566..8166225a49159e70171acf2c8a53e62238d169e4 100644

--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h

+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h

@@ -60,8 +60,8 @@ class ContentSettingImageView : public views::ImageView,

// views::ImageView overrides:

virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;

virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;

- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;

- virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;

+ virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;

+ virtual void OnPaintBackground(gfx::CanvasSkia* canvas) OVERRIDE;

scoped_ptr<ContentSettingImageModel> content_setting_image_model_;