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

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

Issue 2229943003: Reusing Ok/Cancel buttons for intent picker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Temporary fix to force Layout enabling within contents_viewport_ 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
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 void OnScrollEvent(ui::ScrollEvent* event) override; 99 void OnScrollEvent(ui::ScrollEvent* event) override;
100 void OnGestureEvent(ui::GestureEvent* event) override; 100 void OnGestureEvent(ui::GestureEvent* event) override;
101 const char* GetClassName() const override; 101 const char* GetClassName() const override;
102 102
103 // ScrollBarController overrides: 103 // ScrollBarController overrides:
104 void ScrollToPosition(ScrollBar* source, int position) override; 104 void ScrollToPosition(ScrollBar* source, int position) override;
105 int GetScrollIncrement(ScrollBar* source, 105 int GetScrollIncrement(ScrollBar* source,
106 bool is_page, 106 bool is_page,
107 bool is_positive) override; 107 bool is_positive) override;
108 108
109 // TODO(djacobo): Remove this method when http://crbug.com/656198 is closed.
110 // Force |contents_viewport_| to enable a Layer().
111 void EnableViewPortLayer();
112
109 private: 113 private:
110 friend class test::ScrollViewTestApi; 114 friend class test::ScrollViewTestApi;
111 115
112 class Viewport; 116 class Viewport;
113 117
114 // Used internally by SetHeader() and SetContents() to reset the view. Sets 118 // Used internally by SetHeader() and SetContents() to reset the view. Sets
115 // |member| to |new_view|. If |new_view| is non-null it is added to |parent|. 119 // |member| to |new_view|. If |new_view| is non-null it is added to |parent|.
116 void SetHeaderOrContents(View* parent, View* new_view, View** member); 120 void SetHeaderOrContents(View* parent, View* new_view, View** member);
117 121
118 // Scrolls the minimum amount necessary to make the specified rectangle 122 // Scrolls the minimum amount necessary to make the specified rectangle
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 private: 254 private:
251 int top_margin_; 255 int top_margin_;
252 int row_height_; 256 int row_height_;
253 257
254 DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper); 258 DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper);
255 }; 259 };
256 260
257 } // namespace views 261 } // namespace views
258 262
259 #endif // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_ 263 #endif // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698