diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/glue/webframe.h | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe.h')
| -rw-r--r-- | webkit/glue/webframe.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h index a63158a..2169549 100644 --- a/webkit/glue/webframe.h +++ b/webkit/glue/webframe.h @@ -354,6 +354,9 @@ class WebFrame : public base::RefCounted<WebFrame> { // but no additional loads should occur. virtual bool IsReloadAllowingStaleData() const = 0; + // Only for test_shell + virtual int PendingFrameUnloadEventCount() const = 0; + private: DISALLOW_COPY_AND_ASSIGN(WebFrame); }; |