Revert "Reusing Ok/Cancel buttons for intent picker"

ui/views/controls/scroll_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
 #define UI_VIEWS_CONTROLS_SCROLL_VIEW_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 91 matching lines @@
   void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   const char* GetClassName() const override;
 
   // ScrollBarController overrides:
   void ScrollToPosition(ScrollBar* source, int position) override;
   int GetScrollIncrement(ScrollBar* source,
                          bool is_page,
                          bool is_positive) override;
 
-  // TODO(djacobo): Remove this method when http://crbug.com/656198  is closed.
-  // Force |contents_viewport_| to enable a Layer().
-  void EnableViewPortLayer();
-
  private:
   friend class test::ScrollViewTestApi;
 
   class Viewport;
 
   // Used internally by SetHeader() and SetContents() to reset the view.  Sets
   // |member| to |new_view|. If |new_view| is non-null it is added to |parent|.
   void SetHeaderOrContents(View* parent, View* new_view, View** member);
 
   // Scrolls the minimum amount necessary to make the specified rectangle
@@ skipping 134 matching lines @@
  private:
   int top_margin_;
   int row_height_;
 
   DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_SCROLL_VIEW_H_