diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 04:29:17 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 04:29:17 +0000 |
| commit | 3d96893747d18a3c1bf06084d4605a4b34af732f (patch) | |
| tree | 9347442c4dd581ab825ed22cddc082e6119000e4 /webkit/tools/test_shell/plugin_tests.cc | |
| parent | 47b0ee174aa53dd1fd473bafae35166538f57a68 (diff) | |
| download | chromium_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/plugin_tests.cc')
| -rw-r--r-- | webkit/tools/test_shell/plugin_tests.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index fedc908..3c07a07 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -155,7 +155,7 @@ TEST_F(PluginTest, DeleteFrameDuringEvent) { FilePath test_html = data_dir_; test_html = test_html.AppendASCII("plugins"); test_html = test_html.AppendASCII("delete_frame.html"); - test_shell_->LoadURL(test_html.ToWStringHack().c_str()); + test_shell_->LoadFile(test_html); test_shell_->WaitTestFinished(); WebKit::WebMouseEvent input; @@ -185,7 +185,7 @@ TEST_F(PluginTest, PluginVisibilty) { FilePath test_html = data_dir_; test_html = test_html.AppendASCII("plugins"); test_html = test_html.AppendASCII("plugin_visibility.html"); - test_shell_->LoadURL(test_html.ToWStringHack().c_str()); + test_shell_->LoadFile(test_html); test_shell_->WaitTestFinished(); WebFrame* main_frame = test_shell_->webView()->GetMainFrame(); |