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/glue/context_menu_unittest.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/glue/context_menu_unittest.cc')
| -rw-r--r-- | webkit/glue/context_menu_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/glue/context_menu_unittest.cc b/webkit/glue/context_menu_unittest.cc index 8fc009f..61cc229 100644 --- a/webkit/glue/context_menu_unittest.cc +++ b/webkit/glue/context_menu_unittest.cc @@ -35,13 +35,12 @@ class ContextMenuCapturing : public TestShellTest { TEST_F(ContextMenuCapturing, ContextMenuCapturing) { // Make sure we have no stored mouse event state - WebViewDelegate* raw_delegate = test_shell_->webView()->GetDelegate(); - TestWebViewDelegate* test_delegate = static_cast<TestWebViewDelegate*>(raw_delegate); + TestWebViewDelegate* test_delegate = test_shell_->delegate(); test_delegate->clear_captured_context_menu_events(); EXPECT_EQ(0U, test_delegate->captured_context_menu_events().size()); - std::wstring test_url = GetTestURL(iframes_data_dir_, "testiframe.html"); - test_shell_->LoadURL(test_url.c_str()); + GURL test_url = GetTestURL(iframes_data_dir_, "testiframe.html"); + test_shell_->LoadURL(test_url); test_shell_->WaitTestFinished(); // Create a right click in the center of the iframe. (I'm hoping this will |