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

Unified Diff: ui/views/controls/scroll_view.cc

Issue 2229943003: Reusing Ok/Cancel buttons for intent picker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Getting rid of GetDefaultDialogButton() 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.cc
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index 68ee68fee3eaa8561e097be266a8ec202f448155..4e9702254711ed131edf0f766c0cda5a2cb4f042 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -182,12 +182,7 @@ ScrollView::ScrollView()
if (!base::FeatureList::IsEnabled(kToolkitViewsScrollWithLayers))
return;
-
- background_color_ = SK_ColorWHITE;
- contents_viewport_->set_background(
- Background::CreateSolidBackground(background_color_));
- contents_viewport_->SetPaintToLayer(true);
- contents_viewport_->layer()->SetMasksToBounds(true);
+ EnableViewPortLayer();
}
ScrollView::~ScrollView() {
@@ -683,6 +678,14 @@ bool ScrollView::ScrollsWithLayers() const {
return contents_viewport_->layer() != nullptr;
}
+void ScrollView::EnableViewPortLayer() {
+ background_color_ = SK_ColorWHITE;
+ contents_viewport_->set_background(
+ Background::CreateSolidBackground(background_color_));
+ contents_viewport_->SetPaintToLayer(true);
+ contents_viewport_->layer()->SetMasksToBounds(true);
+}
+
void ScrollView::OnLayerScrolled() {
UpdateScrollBarPositions();
ScrollHeader();
« chrome/browser/ui/views/intent_picker_bubble_view.cc ('K') | « ui/views/controls/scroll_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698