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

Side by Side Diff: ui/views/controls/scrollbar/base_scroll_bar.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 | « ui/views/controls/scroll_view.cc ('k') | ui/views/controls/scrollbar/base_scroll_bar.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 UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 5 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
7 7
8 #include "ui/views/animation/scroll_animator.h" 8 #include "ui/views/animation/scroll_animator.h"
9 #include "ui/views/context_menu_controller.h" 9 #include "ui/views/context_menu_controller.h"
10 #include "ui/views/controls/button/image_button.h" 10 #include "ui/views/controls/button/image_button.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // Scroll the contents by the specified offset (contents coordinates). 57 // Scroll the contents by the specified offset (contents coordinates).
58 void ScrollByContentsOffset(int contents_offset); 58 void ScrollByContentsOffset(int contents_offset);
59 59
60 // View overrides: 60 // View overrides:
61 virtual gfx::Size GetPreferredSize() OVERRIDE = 0; 61 virtual gfx::Size GetPreferredSize() OVERRIDE = 0;
62 virtual void Layout() OVERRIDE = 0; 62 virtual void Layout() OVERRIDE = 0;
63 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 63 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
64 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 64 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
65 virtual void OnMouseCaptureLost() OVERRIDE; 65 virtual void OnMouseCaptureLost() OVERRIDE;
66 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 66 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
67 virtual ui::GestureStatus OnGestureEvent( 67 virtual ui::EventResult OnGestureEvent(
68 const ui::GestureEvent& event) OVERRIDE; 68 const ui::GestureEvent& event) OVERRIDE;
69 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; 69 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
70 70
71 // ScrollBar overrides: 71 // ScrollBar overrides:
72 virtual void Update(int viewport_size, 72 virtual void Update(int viewport_size,
73 int content_size, 73 int content_size,
74 int contents_scroll_offset) OVERRIDE; 74 int contents_scroll_offset) OVERRIDE;
75 virtual int GetLayoutSize() const OVERRIDE = 0; 75 virtual int GetLayoutSize() const OVERRIDE = 0;
76 virtual int GetPosition() const OVERRIDE; 76 virtual int GetPosition() const OVERRIDE;
77 77
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 scoped_ptr<MenuRunner> menu_runner_; 163 scoped_ptr<MenuRunner> menu_runner_;
164 scoped_ptr<ScrollAnimator> scroll_animator_; 164 scoped_ptr<ScrollAnimator> scroll_animator_;
165 165
166 DISALLOW_COPY_AND_ASSIGN(BaseScrollBar); 166 DISALLOW_COPY_AND_ASSIGN(BaseScrollBar);
167 }; 167 };
168 168
169 } // namespace views 169 } // namespace views
170 170
171 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 171 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
OLDNEW
« no previous file with comments | « ui/views/controls/scroll_view.cc ('k') | ui/views/controls/scrollbar/base_scroll_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698