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

1 files changed, 8 insertions, 1 deletions

diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index b1c1240..0633214 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -60,6 +60,7 @@ struct WindowFeatures;
 
 namespace WebKit {
 class WebDataSourceImpl;
+class WebFrameClient;
 }
 
 // Implementation of WebFrame, note that this is a reference counted object.
@@ -130,6 +131,7 @@ class WebFrameImpl : public WebKit::WebFrame,
   virtual void dispatchWillSendRequest(WebKit::WebURLRequest& request);
   virtual void commitDocumentData(const char* data, size_t length);
   virtual unsigned unloadListenerCount() const;
+  virtual bool isProcessingUserGesture() const;
   virtual void replaceSelection(const WebKit::WebString& text);
   virtual void insertText(const WebKit::WebString& text);
   virtual void setMarkedText(
@@ -169,7 +171,7 @@ class WebFrameImpl : public WebKit::WebFrame,
   virtual WebKit::WebString contentAsText(size_t max_chars) const;
   virtual WebKit::WebString contentAsMarkup() const;
 
-  WebFrameImpl();
+  WebFrameImpl(WebKit::WebFrameClient* client);
   ~WebFrameImpl();
 
   static int live_object_count() {
@@ -242,6 +244,9 @@ class WebFrameImpl : public WebKit::WebFrame,
   webkit_glue::PasswordAutocompleteListener* GetPasswordListener(
       WebCore::HTMLInputElement* user_name_input_element);
 
+  WebKit::WebFrameClient* client() const { return client_; }
+  void drop_client() { client_ = NULL; }
+
  protected:
   friend class WebFrameLoaderClient;
 
@@ -258,6 +263,8 @@ class WebFrameImpl : public WebKit::WebFrame,
   // asynchronously in order to scope string matches during a find operation.
   ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_;
 
+  WebKit::WebFrameClient* client_;
+
   // This is a weak pointer to our corresponding WebCore frame.  A reference to
   // ourselves is held while frame_ is valid.  See our Closing method.
   WebCore::Frame* frame_;