Generate thumbnails in the browser process.

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 1633aec404349a7fce78ff8707ae9e10809cd7f0..13e279421535afd5e4a55e7d867ad92d1a9a4083 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1241,7 +1241,13 @@ void RenderView::CapturePageInfo(int load_id, bool preliminary_capture) {
         TranslateHelper::IsPageTranslatable(&document)));
   }
 
-  OnCaptureThumbnail();
+  // Generate the thumbnail here if the in-browser thumbnailing isn't
+  // enabled. TODO(satorux): Remove this and related code once
+  // crbug.com/65936 is complete.
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableInBrowserThumbnailing)) {
+    OnCaptureThumbnail();
+  }
 
   if (phishing_delegate_.get())
     phishing_delegate_->FinishedLoad(&contents);
@@ -5155,6 +5161,11 @@ webkit::ppapi::PluginInstance* RenderView::GetBitmapForOptimizedPluginPaint(
       paint_bounds, dib, location, clip);
 }
 
+gfx::Size RenderView::GetScrollOffset() {
+  WebKit::WebSize scroll_offset = webview()->mainFrame()->scrollOffset();
+  return gfx::Size(scroll_offset.width, scroll_offset.height);
+}
+
 void RenderView::OnClearFocusedNode() {
   if (webview())
     webview()->clearFocusedNode();