Hook up WebFrameClient, replacing many WebViewDelegate methods....

webkit/glue/webframe_impl.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 42 matching lines @@
 class HistoryItem;
 class KURL;
 class Node;
 class Range;
 class SubstituteData;
 struct WindowFeatures;
 }
 
 namespace WebKit {
 class WebDataSourceImpl;
+class WebFrameClient;
 }
 
 // Implementation of WebFrame, note that this is a reference counted object.
 class WebFrameImpl : public WebKit::WebFrame,
                      public base::RefCounted<WebFrameImpl> {
  public:
   // WebFrame methods:
   virtual WebKit::WebString name() const;
   virtual WebKit::WebURL url() const;
   virtual WebKit::WebURL favIconURL() const;
@@ skipping 50 matching lines @@
   virtual WebKit::WebDataSource* dataSource() const;
   virtual WebKit::WebHistoryItem previousHistoryItem() const;
   virtual WebKit::WebHistoryItem currentHistoryItem() const;
   virtual void enableViewSourceMode(bool enable);
   virtual bool isViewSourceModeEnabled() const;
   virtual void setReferrerForRequest(
       WebKit::WebURLRequest& request, const WebKit::WebURL& referrer);
   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(
       const WebKit::WebString& text, unsigned location, unsigned length);
   virtual void unmarkText();
   virtual bool hasMarkedText() const;
   virtual WebKit::WebRange markedRange() const;
   virtual bool executeCommand(const WebKit::WebString& command);
   virtual bool executeCommand(
       const WebKit::WebString& command, const WebKit::WebString& value);
@@ skipping 19 matching lines @@
   virtual void cancelPendingScopingEffort();
   virtual void increaseMatchCount(int count, int identifier);
   virtual void reportFindInPageSelection(
       const WebKit::WebRect& selection_rect, int active_match_ordinal,
       int identifier);
   virtual void resetMatchCount();
   virtual WebKit::WebURL completeURL(const WebKit::WebString& url) const;
   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() {
     return live_object_count_;
   }
 
   // Called by the WebViewImpl to initialize its main frame:
   void InitMainFrame(WebViewImpl* webview_impl);
 
   PassRefPtr<WebCore::Frame> CreateChildFrame(
@@ skipping 52 matching lines @@
       PassRefPtr<WebCore::HTMLInputElement> user_name_input_element,
       webkit_glue::PasswordAutocompleteListener* listener);
 
   // Returns the password autocomplete listener associated with the passed
   // user name input element, or NULL if none available.
   // Note that the returned listener is owner by the WebFrameImpl and should not
   // be kept around as it is deleted when the page goes away.
   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;
 
   // Informs the WebFrame that the Frame is being closed, called by the
   // WebFrameLoaderClient
   void Closing();
 
   // Used to check for leaks of this object.
   static int live_object_count_;
 
   WebFrameLoaderClient frame_loader_client_;
 
   // This is a factory for creating cancelable tasks for this frame that run
   // 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_;
 
   // A way for the main frame to keep track of which frame has an active
   // match. Should be NULL for all other frames.
   WebFrameImpl* active_match_frame_;
 
   // The range of the active match for the current frame.
   RefPtr<WebCore::Range> active_match_;
@@ skipping 85 matching lines @@
   // The input fields that are interested in edit events and their associated
   // listeners.
   typedef HashMap<RefPtr<WebCore::HTMLInputElement>,
       webkit_glue::PasswordAutocompleteListener*> PasswordListenerMap;
   PasswordListenerMap password_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBFRAME_IMPL_H_