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, 6 insertions, 5 deletions

diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc
index a8afe17..f98993b 100644
--- a/chrome/renderer/loadtimes_extension_bindings.cc
+++ b/chrome/renderer/loadtimes_extension_bindings.cc
@@ -8,10 +8,11 @@
 
 #include "base/time.h"
 #include "chrome/renderer/navigation_state.h"
+#include "webkit/api/public/WebFrame.h"
 #include "v8/include/v8.h"
-#include "webkit/glue/webframe.h"
 
 using WebKit::WebDataSource;
+using WebKit::WebFrame;
 using WebKit::WebNavigationType;
 
 // Values for CSI "tran" property
@@ -94,9 +95,9 @@ class LoadTimesExtensionWrapper : public v8::Extension {
   }
 
   static v8::Handle<v8::Value> GetLoadTimes(const v8::Arguments& args) {
-    WebFrame* frame = WebFrame::RetrieveFrameForEnteredContext();
+    WebFrame* frame = WebFrame::frameForEnteredContext();
     if (frame) {
-      WebDataSource* data_source = frame->GetDataSource();
+      WebDataSource* data_source = frame->dataSource();
       if (data_source) {
         NavigationState* navigation_state =
             NavigationState::FromDataSource(data_source);
@@ -135,9 +136,9 @@ class LoadTimesExtensionWrapper : public v8::Extension {
   }
 
   static v8::Handle<v8::Value> GetCSI(const v8::Arguments& args) {
-    WebFrame* frame = WebFrame::RetrieveFrameForEnteredContext();
+    WebFrame* frame = WebFrame::frameForEnteredContext();
     if (frame) {
-      WebDataSource* data_source = frame->GetDataSource();
+      WebDataSource* data_source = frame->dataSource();
       if (data_source) {
         NavigationState* navigation_state =
             NavigationState::FromDataSource(data_source);