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

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

Issue 2193153002: MacViews: Send Mac scrollWheel NSEvents as ui::ET_SCROLL (ui::ScrollEvent). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-ScrollLayers
Patch Set: NSDictionary subscripting Created 4 years, 2 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
« no previous file with comments | « ui/views/cocoa/bridged_content_view.mm ('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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 void SetVerticalScrollBar(ScrollBar* vert_sb); 89 void SetVerticalScrollBar(ScrollBar* vert_sb);
90 90
91 // View overrides: 91 // View overrides:
92 gfx::Size GetPreferredSize() const override; 92 gfx::Size GetPreferredSize() const override;
93 int GetHeightForWidth(int width) const override; 93 int GetHeightForWidth(int width) const override;
94 void Layout() override; 94 void Layout() override;
95 bool OnKeyPressed(const ui::KeyEvent& event) override; 95 bool OnKeyPressed(const ui::KeyEvent& event) override;
96 bool OnMouseWheel(const ui::MouseWheelEvent& e) override; 96 bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
97 void OnMouseEntered(const ui::MouseEvent& event) override; 97 void OnMouseEntered(const ui::MouseEvent& event) override;
98 void OnMouseExited(const ui::MouseEvent& event) override; 98 void OnMouseExited(const ui::MouseEvent& event) override;
99 void OnScrollEvent(ui::ScrollEvent* event) override;
99 void OnGestureEvent(ui::GestureEvent* event) override; 100 void OnGestureEvent(ui::GestureEvent* event) override;
100 const char* GetClassName() const override; 101 const char* GetClassName() const override;
101 102
102 // ScrollBarController overrides: 103 // ScrollBarController overrides:
103 void ScrollToPosition(ScrollBar* source, int position) override; 104 void ScrollToPosition(ScrollBar* source, int position) override;
104 int GetScrollIncrement(ScrollBar* source, 105 int GetScrollIncrement(ScrollBar* source,
105 bool is_page, 106 bool is_page,
106 bool is_positive) override; 107 bool is_positive) override;
107 108
108 private: 109 private:
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 private: 250 private:
250 int top_margin_; 251 int top_margin_;
251 int row_height_; 252 int row_height_;
252 253
253 DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper); 254 DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper);
254 }; 255 };
255 256
256 } // namespace views 257 } // namespace views
257 258
258 #endif // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_ 259 #endif // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/cocoa/bridged_content_view.mm ('k') | ui/views/controls/scroll_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698