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

Unified 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: Removing callback usage on WebContentsDestroyed 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/scroll_view.h
diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
index 5f55c20d31b7d1bd0aeb883103ae693a73291488..897086875a09a52a57d771302204d06cafdc80cf 100644
--- a/ui/views/controls/scroll_view.h
+++ b/ui/views/controls/scroll_view.h
@@ -106,6 +106,10 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
bool is_page,
bool is_positive) override;
+ // Activate a Layer() for the |contents_viewport_| if the passed parameter is
+ // true or any of the children in the ScrollView contains a layer.
+ void ActivateLayer(bool force_layer_creation);
+
private:
friend class test::ScrollViewTestApi;
@@ -143,6 +147,9 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
// Whether the ScrollView scrolls using ui::Layer APIs.
bool ScrollsWithLayers() const;
+ // Whether any of the children in the |child|-rooted subtree has a layer.
+ bool ChildrenLayerCheck(View* child) const;
+
// Callback entrypoint when hosted Layers are scrolled by the Compositor.
void OnLayerScrolled();

Powered by Google App Engine
This is Rietveld 408576698