Use WebWidget from the WebKit API. This change also makes...

chrome/renderer/print_web_view_helper.cc

 // Copyright (c) 2009 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 "chrome/renderer/print_web_view_helper.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/gfx/size.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "printing/native_metafile.h"
 #include "printing/units.h"
 #include "webkit/api/public/WebConsoleMessage.h"
+#include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLRequest.h"
 #include "webkit/glue/webframe.h"
 
 #if defined(OS_WIN)
 #include "skia/ext/vector_canvas.h"
 #endif
 
 using WebKit::WebConsoleMessage;
+using WebKit::WebRect;
+using WebKit::WebScreenInfo;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
 
 namespace {
 
 const int kMinSecondsToIgnoreJavascriptInitiatedPrint = 2;
 const int kMaxSecondsToIgnoreJavascriptInitiatedPrint = 2 * 60;  // 2 Minutes.
 
 // Class that calls the Begin and End print functions on the frame and changes
 // the size of the view temporarily to support full page printing..
@@ skipping 18 matching lines @@
 
     // Layout page according to printer page size. Since WebKit shrinks the
     // size of the page automatically (from 125% to 200%) we trick it to
     // think the page is 125% larger so the size of the page is correct for
     // minimum (default) scaling.
     // This is important for sites that try to fill the page.
     gfx::Size print_layout_size(print_canvas_size_);
     print_layout_size.set_height(static_cast<int>(
         static_cast<double>(print_layout_size.height()) * 1.25));
 
-    prev_view_size_ = web_view->GetSize();
+    prev_view_size_ = web_view->size();
 
-    web_view->Resize(print_layout_size);
+    web_view->resize(print_layout_size);
 
     expected_pages_count_ = frame->PrintBegin(print_canvas_size_);
   }
 
   int GetExpectedPageCount() const {
     return expected_pages_count_;
   }
 
   gfx::Size GetPrintCanvasSize() const {
     return print_canvas_size_;
   }
 
   ~PrepareFrameAndViewForPrint() {
     frame_->PrintEnd();
-    web_view_->Resize(prev_view_size_);
+    web_view_->resize(prev_view_size_);
   }
 
  private:
   WebFrame* frame_;
   WebView* web_view_;
   gfx::Size print_canvas_size_;
   gfx::Size prev_view_size_;
   int expected_pages_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PrepareFrameAndViewForPrint);
@@ skipping 130 matching lines @@
     WebView* web_view = print_web_view_.get();
     if (!web_view)
       web_view = render_view_->webview();
 
     // TODO: Create an async alert (http://crbug.com/14918).
     render_view_->RunJavaScriptAlert(web_view->GetMainFrame(),
         l10n_util::GetString(IDS_PRINT_SPOOL_FAILED_ERROR_TEXT));
   }
 
   if (print_web_view_.get()) {
-    print_web_view_->Close();
+    print_web_view_->close();
     print_web_view_.release();  // Close deletes object.
     print_pages_params_.reset();
   }
 
 }
 
 bool PrintWebViewHelper::CopyAndPrint(const ViewMsg_PrintPages_Params& params,
                                       WebFrame* web_frame) {
   // Create a new WebView with the same settings as the current display one.
   // Except that we disable javascript (don't want any active content running
@@ skipping 160 matching lines @@
 }
 
 bool PrintWebViewHelper::Send(IPC::Message* msg) {
   return render_view_->Send(msg);
 }
 
 int32 PrintWebViewHelper::routing_id() {
   return render_view_->routing_id();
 }
 
+WebRect PrintWebViewHelper::windowRect() {
+  NOTREACHED();
+  return WebRect();
+}
+
+WebRect PrintWebViewHelper::windowResizerRect() {
+  NOTREACHED();
+  return WebRect();
+}
+
+WebRect PrintWebViewHelper::rootWindowRect() {
+  NOTREACHED();
+  return WebRect();
+}
+
+WebScreenInfo PrintWebViewHelper::screenInfo() {
+  NOTREACHED();
+  return WebScreenInfo();
+}
+
 void PrintWebViewHelper::DidStopLoading(WebView* webview) {
   DCHECK(print_pages_params_.get() != NULL);
   DCHECK_EQ(webview, print_web_view_.get());
   PrintPages(*print_pages_params_.get(), print_web_view_->GetMainFrame());
 }
-
-void PrintWebViewHelper::GetWindowRect(WebWidget* webwidget,
-                                       WebKit::WebRect* rect) {
-  NOTREACHED();
-}
-
-WebKit::WebScreenInfo PrintWebViewHelper::GetScreenInfo(WebWidget* webwidget) {
-  WebKit::WebScreenInfo info;
-  NOTREACHED();
-  return info;
-}
-
-bool PrintWebViewHelper::IsHidden(WebWidget* webwidget) {
-  NOTREACHED();
-  return true;
-}