| Index: ash/wm/workspace/frame_maximize_button.cc
|
| ===================================================================
|
| --- ash/wm/workspace/frame_maximize_button.cc (revision 151406)
|
| +++ ash/wm/workspace/frame_maximize_button.cc (working copy)
|
| @@ -184,7 +184,7 @@
|
| }
|
| }
|
|
|
| -bool FrameMaximizeButton::OnMousePressed(const views::MouseEvent& event) {
|
| +bool FrameMaximizeButton::OnMousePressed(const ui::MouseEvent& event) {
|
| is_snap_enabled_ = event.IsLeftMouseButton();
|
| if (is_snap_enabled_)
|
| ProcessStartEvent(event);
|
| @@ -192,7 +192,7 @@
|
| return true;
|
| }
|
|
|
| -void FrameMaximizeButton::OnMouseEntered(const views::MouseEvent& event) {
|
| +void FrameMaximizeButton::OnMouseEntered(const ui::MouseEvent& event) {
|
| ImageButton::OnMouseEntered(event);
|
| if (!maximizer_.get()) {
|
| DCHECK(GetWidget());
|
| @@ -206,7 +206,7 @@
|
| }
|
| }
|
|
|
| -void FrameMaximizeButton::OnMouseExited(const views::MouseEvent& event) {
|
| +void FrameMaximizeButton::OnMouseExited(const ui::MouseEvent& event) {
|
| ImageButton::OnMouseExited(event);
|
| // Remove the bubble menu when the button is not pressed and the mouse is not
|
| // within the bubble.
|
| @@ -227,13 +227,13 @@
|
| }
|
| }
|
|
|
| -bool FrameMaximizeButton::OnMouseDragged(const views::MouseEvent& event) {
|
| +bool FrameMaximizeButton::OnMouseDragged(const ui::MouseEvent& event) {
|
| if (is_snap_enabled_)
|
| ProcessUpdateEvent(event);
|
| return ImageButton::OnMouseDragged(event);
|
| }
|
|
|
| -void FrameMaximizeButton::OnMouseReleased(const views::MouseEvent& event) {
|
| +void FrameMaximizeButton::OnMouseReleased(const ui::MouseEvent& event) {
|
| maximizer_.reset();
|
| if (!ProcessEndEvent(event))
|
| ImageButton::OnMouseReleased(event);
|
|
|