MacViews: Overlay Scrollbars with Show/Hide Animations

ui/base/test/scoped_preferred_scroller_style_mac.h

Index: ui/base/test/scoped_preferred_scroller_style_mac.h
diff --git a/ui/base/test/scoped_preferred_scroller_style_legacy_mac.h b/ui/base/test/scoped_preferred_scroller_style_mac.h
similarity index 59%
rename from ui/base/test/scoped_preferred_scroller_style_legacy_mac.h
rename to ui/base/test/scoped_preferred_scroller_style_mac.h
index 99b0028db8fccad760749cb072caa12773280947..9e56130dd6b8cd068107b312d1f62ecb8b6ee3a0 100644
--- a/ui/base/test/scoped_preferred_scroller_style_legacy_mac.h
+++ b/ui/base/test/scoped_preferred_scroller_style_mac.h
@@ -17,17 +17,21 @@ class ScopedObjCClassSwizzler;
 namespace ui {
 namespace test {
 
-// Overrides system setting for scrollbar style with NSScrollerStyleLegacy,
-// which means "always show scrollbars".
-class ScopedPreferredScrollerStyleLegacy {
+// Overrides system setting for scrollbar style with NSScrollerOverlay if we
+// want the scrollbar to overlay. Otherwise, override with
+// NSScrollerStyleLegacy which means "always show scrollbars".
+class ScopedPreferredScrollerStyle {
  public:
-  ScopedPreferredScrollerStyleLegacy();
-  ~ScopedPreferredScrollerStyleLegacy();
+  explicit ScopedPreferredScrollerStyle(bool overlay);
+  ~ScopedPreferredScrollerStyle();
 
  private:
   scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzler_;
 
-  DISALLOW_COPY_AND_ASSIGN(ScopedPreferredScrollerStyleLegacy);
+  // True if the scrollbar style should overlay.
+  bool overlay_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedPreferredScrollerStyle);
 };
 
 }  // namespace test