Replace webkit/glue/screen_info.h with WebKit/chromium/public/WebScreenInfo.h...

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2006-2008 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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include "base/file_util.h"
 #include "base/gfx/point.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/trace_event.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/weberror.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/weburlrequest.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_webworker_helper.h"
 
 #if defined(OS_WIN)
 // TODO(port): make these files work everywhere.
 #include "webkit/tools/test_shell/drag_delegate.h"
 #include "webkit/tools/test_shell/drop_delegate.h"
 #endif
 
+using WebKit::WebScreenInfo;
+
 namespace {
 
 // WebNavigationType debugging strings taken from PolicyDelegate.mm.
 const char* kLinkClickedString = "link clicked";
 const char* kFormSubmittedString = "form submitted";
 const char* kBackForwardString = "back/forward";
 const char* kReloadString = "reload";
 const char* kFormResubmittedString = "form resubmitted";
 const char* kOtherString = "other";
 const char* kIllegalString = "illegal value";
@@ skipping 665 matching lines @@
 void TestWebViewDelegate::Focus(WebWidget* webwidget) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget))
     shell_->SetFocus(host, true);
 }
 
 void TestWebViewDelegate::Blur(WebWidget* webwidget) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget))
     shell_->SetFocus(host, false);
 }
 
-bool TestWebViewDelegate::IsHidden() {
+bool TestWebViewDelegate::IsHidden(WebWidget* webwidget) {
   return false;
 }
 
+WebScreenInfo TestWebViewDelegate::GetScreenInfo(WebWidget* webwidget) {
+  if (WebWidgetHost* host = GetHostForWidget(webwidget))
+    return host->GetScreenInfo();
+
+  return WebScreenInfo();
+}
+
 void TestWebViewDelegate::RegisterDragDrop() {
 #if defined(OS_WIN)
   // TODO(port): add me once drag and drop works.
   DCHECK(!drop_delegate_);
   drop_delegate_ = new TestDropDelegate(shell_->webViewWnd(),
                                         shell_->webView());
 #endif
 }
 
 // Private methods -----------------------------------------------------------
@@ skipping 112 matching lines @@
   }
 }
 
 WebWorker* TestWebViewDelegate::CreateWebWorker(WebWorkerClient* client) {
 #if ENABLE(WORKERS)
   return TestWebWorkerHelper::CreateWebWorker(client);
 #else
   return NULL;
 #endif
 }