Switch to WebFrame from the WebKit API....

webkit/tools/test_shell/test_webview_delegate_win.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 "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <objidl.h>
 #include <shlobj.h>
 #include <shlwapi.h>
 
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/trace_event.h"
 #include "net/base/net_errors.h"
 #include "webkit/api/public/WebCursorInfo.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/glue/webdropdata.h"
-#include "webkit/glue/webframe.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webplugin.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/drag_delegate.h"
 #include "webkit/tools/test_shell/drop_delegate.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
@@ skipping 116 matching lines @@
 WebRect TestWebViewDelegate::windowResizerRect() {
   // Not necessary on Windows.
   return WebRect();
 }
 
 void TestWebViewDelegate::runModal() {
   WebWidgetHost* host = GetWidgetHost();
   if (!host)
     return;
 
-  show(WebNavigationPolicy() /*XXX NEW_WINDOW*/);
+  show(WebKit::WebNavigationPolicyNewWindow);
 
   WindowList* wl = TestShell::windowList();
   for (WindowList::const_iterator i = wl->begin(); i != wl->end(); ++i) {
     if (*i != shell_->mainWnd())
       EnableWindow(*i, FALSE);
   }
 
   shell_->set_is_modal(true);
   MessageLoop::current()->Run();
 
   for (WindowList::const_iterator i = wl->begin(); i != wl->end(); ++i)
     EnableWindow(*i, TRUE);
 }
 
 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
   // No selection clipboard on windows, do nothing.
 }
 
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   // The Windows test shell, pre-refactoring, ignored this.  *shrug*
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   std::wstring url_string = UTF8ToWide(url.spec());
   SendMessage(shell_->editWnd(), WM_SETTEXT, 0,
               reinterpret_cast<LPARAM>(url_string.c_str()));
 }