Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: webkit/glue/webframe_impl.h

Issue 200054: Hook up WebFrameClient, replacing many WebViewDelegate methods.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/temporary_glue.cc ('k') | webkit/glue/webframe_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webframe_impl.h
===================================================================
--- webkit/glue/webframe_impl.h (revision 25715)
+++ webkit/glue/webframe_impl.h (working copy)
@@ -60,6 +60,7 @@
namespace WebKit {
class WebDataSourceImpl;
+class WebFrameClient;
}
// Implementation of WebFrame, note that this is a reference counted object.
@@ -130,6 +131,7 @@
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 @@
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 @@
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 @@
// 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_;
« no previous file with comments | « webkit/glue/temporary_glue.cc ('k') | webkit/glue/webframe_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698