| Index: ash/wm/partial_screenshot_view.h
|
| ===================================================================
|
| --- ash/wm/partial_screenshot_view.h (revision 151406)
|
| +++ ash/wm/partial_screenshot_view.h (working copy)
|
| @@ -28,7 +28,7 @@
|
| static void StartPartialScreenshot(ScreenshotDelegate* screenshot_delegate);
|
|
|
| // Overriddden from View:
|
| - virtual gfx::NativeCursor GetCursor(const views::MouseEvent& event) OVERRIDE;
|
| + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE;
|
|
|
| // Overridden from internal::OverlayEventFilter::Delegate:
|
| virtual void Cancel() OVERRIDE;
|
| @@ -41,10 +41,10 @@
|
| // Overridden from View:
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| virtual void OnMouseCaptureLost() OVERRIDE;
|
| - virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
| - virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
|
| virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
|
| - virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
|
|
| bool is_dragging_;
|
| gfx::Point start_position_;
|
|
|