Revert "Reusing Ok/Cancel buttons for intent picker"

ui/views/controls/scroll_view.cc

Index: ui/views/controls/scroll_view.cc
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index 58fa126eef183ec28cd56d4df166419611c4366f..a358128a5a8d73940bde2ebf762cc8c0d123dab6 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -183,7 +183,12 @@ ScrollView::ScrollView()
 
   if (!base::FeatureList::IsEnabled(kToolkitViewsScrollWithLayers))
     return;
-  EnableViewPortLayer();
+
+  background_color_ = SK_ColorWHITE;
+  contents_viewport_->set_background(
+      Background::CreateSolidBackground(background_color_));
+  contents_viewport_->SetPaintToLayer(true);
+  contents_viewport_->layer()->SetMasksToBounds(true);
 }
 
 ScrollView::~ScrollView() {
@@ -694,14 +699,6 @@ 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();