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/webplugin_impl.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/webplugin_impl.h')
| -rw-r--r-- | webkit/glue/webplugin_impl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h index e83427f..b7a4dab 100644 --- a/webkit/glue/webplugin_impl.h +++ b/webkit/glue/webplugin_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H__ -#define WEBKIT_GLUE_WEBPLUGIN_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ +#define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ #include <string> #include <map> @@ -29,7 +29,6 @@ class WebPluginImpl; class MultipartResponseDelegate; namespace WebCore { - class DeprecatedString; class Element; class Event; class Frame; @@ -151,7 +150,7 @@ class WebPluginImpl : public WebPlugin, // Returns true on success. bool InitiateHTTPRequest(int resource_id, WebPluginResourceClient* client, const char* method, const char* buf, int buf_len, - const GURL& complete_url_string, + const GURL& url, const char* range_info); gfx::Rect GetWindowClipRect(const gfx::Rect& rect); @@ -287,8 +286,7 @@ class WebPluginImpl : public WebPlugin, // The plugin source URL. GURL plugin_url_; - DISALLOW_EVIL_CONSTRUCTORS(WebPluginImpl); + DISALLOW_COPY_AND_ASSIGN(WebPluginImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ |