diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
| commit | dd7daa80d25deb78ab365e28df4d93437357793b (patch) | |
| tree | fb4dd2331820f5e32ddeb7e2bfb731f0604fbc0d /chrome/test | |
| parent | 64c40aa34646a198a04029ee6b78dd9559595dc5 (diff) | |
| download | chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.zip chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.gz chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.bz2 | |
Switch to WebFrame from the WebKit API.
I tried to avoid unnecessary changes in this CL to help make it easier to
review.
As part of this CL, glue/webtextinput* are folded into WebFrame / WebFrameImpl.
R=dglazkov
BUG=10034
TEST=none
Review URL: http://codereview.chromium.org/164225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/render_view_test.cc | 10 | ||||
| -rw-r--r-- | chrome/test/render_view_test.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc index dbc61a7..2530dbe 100644 --- a/chrome/test/render_view_test.cc +++ b/chrome/test/render_view_test.cc @@ -14,22 +14,22 @@ #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/js_only_v8_extensions.h" #include "chrome/renderer/renderer_main_platform_delegate.h" +#include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebInputEvent.h" #include "webkit/api/public/WebKit.h" #include "webkit/api/public/WebScriptSource.h" #include "webkit/api/public/WebURLRequest.h" #include "webkit/glue/webview.h" +using WebKit::WebFrame; using WebKit::WebScriptSource; using WebKit::WebString; using WebKit::WebURLRequest; namespace { - const int32 kRouteId = 5; const int32 kOpenerId = 7; - -}; +} void RenderViewTest::ProcessPendingMessages() { msg_loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask()); @@ -41,7 +41,7 @@ WebFrame* RenderViewTest::GetMainFrame() { } void RenderViewTest::ExecuteJavaScript(const char* js) { - GetMainFrame()->ExecuteScript(WebScriptSource(WebString::fromUTF8(js))); + GetMainFrame()->executeScript(WebScriptSource(WebString::fromUTF8(js))); } void RenderViewTest::LoadHTML(const char* html) { @@ -49,7 +49,7 @@ void RenderViewTest::LoadHTML(const char* html) { url_str.append(html); GURL url(url_str); - GetMainFrame()->LoadRequest(WebURLRequest(url)); + GetMainFrame()->loadRequest(WebURLRequest(url)); // The load actually happens asynchronously, so we pump messages to process // the pending continuation. diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h index 40e6256..5a9a78a 100644 --- a/chrome/test/render_view_test.h +++ b/chrome/test/render_view_test.h @@ -18,7 +18,7 @@ #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/renderer_webkitclient_impl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/webframe.h" +#include "webkit/api/public/WebFrame.h" class RenderViewTest : public testing::Test { public: @@ -30,7 +30,7 @@ class RenderViewTest : public testing::Test { void ProcessPendingMessages(); // Returns a pointer to the main frame. - WebFrame* GetMainFrame(); + WebKit::WebFrame* GetMainFrame(); // Executes the given JavaScript in the context of the main frame. The input // is a NULL-terminated UTF-8 string. |