summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/layout_test_controller.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 04:29:17 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 04:29:17 +0000
commit3d96893747d18a3c1bf06084d4605a4b34af732f (patch)
tree9347442c4dd581ab825ed22cddc082e6119000e4 /webkit/tools/test_shell/layout_test_controller.cc
parent47b0ee174aa53dd1fd473bafae35166538f57a68 (diff)
downloadchromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.zip
chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.tar.gz
chromium_src-3d96893747d18a3c1bf06084d4605a4b34af732f.tar.bz2
Hook up WebFrameClient, replacing many WebViewDelegate methods.
Moved NavigationGesture out of webview_delegate.h into its own header in chrome/common since it is only needed by Chrome. Adds WebFrame::isProcessingUserGesture to facilitate the removal of NavigationGesture. Cleaned up some TestShell methods related to URL loading. The method to load an URL now takes a GURL instead of a wchar_t*. R=dglazkov BUG=21332 TEST=none Review URL: http://codereview.chromium.org/200054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.cc')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 6244cd1..8fa349c 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -374,8 +374,7 @@ class WorkItemLoad : public LayoutTestController::WorkItem {
WorkItemLoad(const GURL& url, const string& target)
: url_(url), target_(target) {}
bool Run(TestShell* shell) {
- shell->LoadURLForFrame(UTF8ToWide(url_.spec()).c_str(),
- UTF8ToWide(target_).c_str());
+ shell->LoadURLForFrame(url_, UTF8ToWide(target_).c_str());
return true; // TODO(darin): Did it really start a navigation?
}
private: