ash/system/tray/tray_views.h - Issue 10832282: Replace views::MouseEvent with ui::MouseEvent

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: ash/system/tray/tray_views.h

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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 side-by-side diff with in-line comments

Download patch

Index: ash/system/tray/tray_views.h

===================================================================

--- ash/system/tray/tray_views.h (revision 151406)

+++ ash/system/tray/tray_views.h (working copy)

@@ -75,8 +75,8 @@

// Overridden from views::View.

virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;

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

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

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

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

virtual void OnMouseCaptureLost() OVERRIDE;

virtual ui::GestureStatus OnGestureEvent(

const views::GestureEvent& event) OVERRIDE;

@@ -126,8 +126,8 @@

// Overridden from views::View.

virtual gfx::Size GetPreferredSize() OVERRIDE;

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

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

+ virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;

+ virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;

virtual void OnEnabledChanged() OVERRIDE;

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

virtual void OnFocus() OVERRIDE;

@@ -157,7 +157,7 @@

// views::View public method overrides.

virtual gfx::Size GetPreferredSize() OVERRIDE;

virtual void Layout() OVERRIDE;

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

+ virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;

protected:

// views::View protected method overrides.

@@ -180,8 +180,8 @@

private:

// Overridden from views::View.

virtual gfx::Size GetPreferredSize() OVERRIDE;

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

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

+ virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;

+ virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;

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

virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE;

virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;

« no previous file with comments | « ash/system/tray/tray_notification_view.cc ('k') | ash/system/tray/tray_views.cc » ('j') | no next file with comments »