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

1 files changed, 4 insertions, 5 deletions

diff --git a/chrome/renderer/external_host_bindings.cc b/chrome/renderer/external_host_bindings.cc
index 7aaf139..70b867c 100644
--- a/chrome/renderer/external_host_bindings.cc
+++ b/chrome/renderer/external_host_bindings.cc
@@ -7,7 +7,6 @@
 #include "base/values.h"
 #include "chrome/common/render_messages.h"
 #include "webkit/api/public/WebBindings.h"
-#include "webkit/glue/webframe.h"
 
 using WebKit::WebBindings;
 
@@ -45,7 +44,7 @@ void ExternalHostBindings::postMessage(
   }
 
   std::string origin;
-  GURL origin_url(frame_->GetURL().GetOrigin());
+  GURL origin_url(GURL(frame_->url()).GetOrigin());
   if (origin_url.is_empty()) {
     // If the origin is not a scheme/host/port tuple, then return the literal
     // string "null".
@@ -67,7 +66,7 @@ bool ExternalHostBindings::ForwardMessageFromExternalHost(
   bool status = false;
 
   if (target.compare("*") != 0) {
-    GURL frame_url(frame_->GetURL());
+    GURL frame_url(frame_->url());
     GURL frame_origin(frame_url.GetOrigin());
     GURL target_origin(GURL(target).GetOrigin());
 
@@ -141,9 +140,9 @@ bool ExternalHostBindings::CreateMessageEvent(NPObject** message_event) {
   DCHECK(message_event != NULL);
   DCHECK(frame_ != NULL);
 
-  NPObject* window = frame_->GetWindowNPObject();
+  NPObject* window = frame_->windowObject();
   if (!window) {
-    NOTREACHED() << "frame_->GetWindowNPObject";
+    NOTREACHED() << "frame_->windowObject";
     return false;
   }