Move OverscrollController to RenderWidgetHostViewAura

content/browser/frame_host/navigation_entry_screenshot_manager.cc

 // Copyright 2013 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.
 
 #include "content/browser/frame_host/navigation_entry_screenshot_manager.h"
 
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/public/browser/overscroll_configuration.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkLumaColorFilter.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace {
 
@@ skipping 67 matching lines @@
   static bool overscroll_enabled = CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0";
   if (!overscroll_enabled)
     return;
 
   NavigationEntryImpl* entry =
       NavigationEntryImpl::FromNavigationEntry(owner_->GetLastCommittedEntry());
   if (!entry)
     return;
 
+  if (!owner_->delegate()->CanOverscrollContent())
+    return;
+
   RenderViewHost* render_view_host =
       owner_->delegate()->GetRenderViewHost();
-  if (!static_cast<RenderViewHostImpl*>
-      (render_view_host)->overscroll_controller()) {
-    return;
-  }
   content::RenderWidgetHostView* view = render_view_host->GetView();
   if (!view)
     return;
 
   // Make sure screenshots aren't taken too frequently.
   base::Time now = base::Time::Now();
   if (now - last_screenshot_time_ <
           base::TimeDelta::FromMilliseconds(min_screenshot_interval_ms_)) {
     return;
   }
@@ skipping 172 matching lines @@
         owner_->GetEntryAtIndex(forward));
     if (ClearScreenshot(entry))
       --screenshot_count;
     ++forward;
   }
   CHECK_GE(screenshot_count, 0);
   CHECK_LE(screenshot_count, kMaxScreenshots);
 }
 
 }  // namespace content