Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Side by Side Diff: ash/wm/workspace/frame_maximize_button.h

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/window_modality_controller.cc ('k') | ash/wm/workspace/frame_maximize_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_ 5 #ifndef ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_
6 #define ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_ 6 #define ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/wm/workspace/maximize_bubble_frame_state.h" 9 #include "ash/wm/workspace/maximize_bubble_frame_state.h"
10 #include "ash/wm/workspace/snap_types.h" 10 #include "ash/wm/workspace/snap_types.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 const gfx::Rect& new_bounds) OVERRIDE; 54 const gfx::Rect& new_bounds) OVERRIDE;
55 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 55 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
56 56
57 // ImageButton overrides: 57 // ImageButton overrides:
58 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 58 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
59 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; 59 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
60 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; 60 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
61 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; 61 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
62 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 62 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
63 virtual void OnMouseCaptureLost() OVERRIDE; 63 virtual void OnMouseCaptureLost() OVERRIDE;
64 virtual ui::GestureStatus OnGestureEvent( 64 virtual ui::EventResult OnGestureEvent(
65 const ui::GestureEvent& event) OVERRIDE; 65 const ui::GestureEvent& event) OVERRIDE;
66 66
67 // Unit test overwrite: Change the UI delay used for the bubble show up. 67 // Unit test overwrite: Change the UI delay used for the bubble show up.
68 void set_bubble_appearance_delay_ms(int bubble_appearance_delay_ms) { 68 void set_bubble_appearance_delay_ms(int bubble_appearance_delay_ms) {
69 bubble_appearance_delay_ms_ = bubble_appearance_delay_ms; 69 bubble_appearance_delay_ms_ = bubble_appearance_delay_ms;
70 } 70 }
71 71
72 // Unit test accessor for the maximize bubble. 72 // Unit test accessor for the maximize bubble.
73 MaximizeBubbleController* maximizer() { return maximizer_.get(); } 73 MaximizeBubbleController* maximizer() { return maximizer_.get(); }
74 74
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 // The delay of the bubble appearance. 154 // The delay of the bubble appearance.
155 int bubble_appearance_delay_ms_; 155 int bubble_appearance_delay_ms_;
156 156
157 DISALLOW_COPY_AND_ASSIGN(FrameMaximizeButton); 157 DISALLOW_COPY_AND_ASSIGN(FrameMaximizeButton);
158 }; 158 };
159 159
160 } // namespace ash 160 } // namespace ash
161 161
162 #endif // ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_ 162 #endif // ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/wm/window_modality_controller.cc ('k') | ash/wm/workspace/frame_maximize_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698