Reverting 5499

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5500 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 8 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 04c45385..6c1e535 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -439,10 +439,6 @@ bool GetExeDirectory(std::wstring *path) {
   return PathService::Get(base::DIR_EXE, path);
 }
 
-ScreenInfo GetScreenInfo(gfx::ViewHandle window) {
-  return GetScreenInfoHelper(window);
-}
-
 bool SpellCheckWord(const wchar_t* word, int word_len,
                     int* misspelling_start, int* misspelling_len) {
   // Report all words being correctly spelled.
@@ -468,4 +464,3 @@ std::wstring GetWebKitLocale() {
 }
 
 }  // namespace webkit_glue
-
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 880a0fc..fbbc7ff 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -457,5 +457,11 @@ bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   return false;
 }
 
-}  // namespace webkit_glue
+ScreenInfo GetScreenInfo(gfx::ViewHandle window) {
+  // This should call GetScreenInfoHelper, which should be implemented in
+  // webkit_glue_gtk.cc
+  NOTIMPLEMENTED();
+  return ScreenInfo();
+}
 
+}  // namespace webkit_glue
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 9a39528..70db8dc 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -716,5 +716,8 @@ bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
-}  // namespace webkit_glue
+ScreenInfo GetScreenInfo(gfx::ViewHandle window) {
+  return GetScreenInfoHelper(window);
+}
 
+}  // namespace webkit_glue
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 9583664..1b93d9c 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -115,7 +115,7 @@ void TestWebViewDelegate::SetWindowRect(WebWidget* webwidget,
     GtkWidget* window =
         gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
     gtk_window_resize(GTK_WINDOW(window), rect.width(), rect.height());
-    gtk_window_move(GTK_WINDOW(window), rect.x(), rect.y());
+    gtk_window_move(GTK_WINDOW(window), rect.x(), -rect.y());
   }
 }