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

Side by Side Diff: ui/views/controls/scroll_view.h

Issue 2197503002: Route Scroll events through a cc::InputHandler Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-ScrollWheelAsScrollEvent
Patch Set: Abandon DeliverInputForBeginFrame: will not help fix the header row Created 4 years 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
« no previous file with comments | « ui/compositor/overscroll/ui_scroll_input_manager.cc ('k') | ui/views/controls/scroll_view.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_SCROLL_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
6 #define UI_VIEWS_CONTROLS_SCROLL_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 bool OnMouseWheel(const ui::MouseWheelEvent& e) override; 99 bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
100 void OnScrollEvent(ui::ScrollEvent* event) override; 100 void OnScrollEvent(ui::ScrollEvent* event) override;
101 void OnGestureEvent(ui::GestureEvent* event) override; 101 void OnGestureEvent(ui::GestureEvent* event) override;
102 const char* GetClassName() const override; 102 const char* GetClassName() const override;
103 103
104 // ScrollBarController overrides: 104 // ScrollBarController overrides:
105 void ScrollToPosition(ScrollBar* source, int position) override; 105 void ScrollToPosition(ScrollBar* source, int position) override;
106 int GetScrollIncrement(ScrollBar* source, 106 int GetScrollIncrement(ScrollBar* source,
107 bool is_page, 107 bool is_page,
108 bool is_positive) override; 108 bool is_positive) override;
109 void OnScrollEventFromScrollBar(ui::ScrollEvent* event) override;
109 110
110 // TODO(djacobo): Remove this method when http://crbug.com/656198 is closed. 111 // TODO(djacobo): Remove this method when http://crbug.com/656198 is closed.
111 // Force |contents_viewport_| to enable a Layer(). 112 // Force |contents_viewport_| to enable a Layer().
112 void EnableViewPortLayer(); 113 void EnableViewPortLayer();
113 114
114 private: 115 private:
115 friend class test::ScrollViewTestApi; 116 friend class test::ScrollViewTestApi;
116 117
117 class Viewport; 118 class Viewport;
118 119
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 private: 259 private:
259 int top_margin_; 260 int top_margin_;
260 int row_height_; 261 int row_height_;
261 262
262 DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper); 263 DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper);
263 }; 264 };
264 265
265 } // namespace views 266 } // namespace views
266 267
267 #endif // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_ 268 #endif // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
OLDNEW
« no previous file with comments | « ui/compositor/overscroll/ui_scroll_input_manager.cc ('k') | ui/views/controls/scroll_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698