diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 20:43:29 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 20:43:29 +0000 |
| commit | 31f4c7e11012ba7364ce5f84f9943523312f82a5 (patch) | |
| tree | d98755c8b3faed725b0ce25f8660ded518b46156 /chrome/renderer/render_view_unittest.cc | |
| parent | aece2c7fcf3d899be29249220d79a8448f2e9e0e (diff) | |
| download | chromium_src-31f4c7e11012ba7364ce5f84f9943523312f82a5.zip chromium_src-31f4c7e11012ba7364ce5f84f9943523312f82a5.tar.gz chromium_src-31f4c7e11012ba7364ce5f84f9943523312f82a5.tar.bz2 | |
More refactoring for WebPlugin.
This CL eliminates direct calls to WebPluginDelegate::DidFinishLoadWithReason
from WebFrameLoaderClient.
This CL also moves WebDataSourceImpl into webkit/api/src. That change was
needed so that WebPluginContainerImpl can add a WebPluginLoadObserver to it,
which WebFrameLoaderClient uses to communicate back to the WebPlugin upon
completion of the frame load.
WebViewDelegate::DidFinishLoadWithReason is modified to include url and
notify_data parameters, eliminating the URLRequestRouted method. This is done
so that we can support overlapping NPN_GetURLNotify targetting different
frames.
WebPluginContainer grows an executeScriptURL method to deal with javascript:
URLs.
NOTE: I'm working on some UI tests to better cover the case of overlapping
NPN_GetURLNotify calls.
R=jam
BUG=10036
TEST=none yet
Review URL: http://codereview.chromium.org/174514
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view_unittest.cc')
| -rw-r--r-- | chrome/renderer/render_view_unittest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index f09b361..96bcc8f 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -11,10 +11,12 @@ #include "printing/image.h" #include "printing/native_metafile.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/api/public/WebString.h" #include "webkit/api/public/WebURLError.h" using WebKit::WebCompositionCommand; using WebKit::WebFrame; +using WebKit::WebString; using WebKit::WebTextDirection; using WebKit::WebURLError; @@ -382,7 +384,8 @@ TEST_F(RenderViewTest, PrintWithIframe) { // Find the frame and set it as the focused one. This should mean that that // the printout should only contain the contents of that frame. - WebFrame* sub1_frame = view_->webview()->GetFrameWithName(L"sub1"); + WebFrame* sub1_frame = + view_->webview()->GetFrameWithName(WebString::fromUTF8("sub1")); ASSERT_TRUE(sub1_frame); view_->webview()->SetFocusedFrame(sub1_frame); ASSERT_NE(view_->webview()->GetFocusedFrame(), |