diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-07 01:18:20 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-07 01:18:20 +0000 |
| commit | 0a836048108542bb8d10fe399b1ee08f6615501c (patch) | |
| tree | 0180e5662cfb2ce56b9fb078deddb4b91f6778a7 /webkit/glue/webview_delegate.h | |
| parent | 645aaa5a8ef7a1a507e95da0e8794e0cabbf0811 (diff) | |
| download | chromium_src-0a836048108542bb8d10fe399b1ee08f6615501c.zip chromium_src-0a836048108542bb8d10fe399b1ee08f6615501c.tar.gz chromium_src-0a836048108542bb8d10fe399b1ee08f6615501c.tar.bz2 | |
Reverting 9366.
Reverting due to failures in layout tests
Review URL: http://codereview.chromium.org/21159
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webview_delegate.h')
| -rw-r--r-- | webkit/glue/webview_delegate.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index 2fe2351..955985e 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -23,8 +23,8 @@ // of ChromeClient and FrameLoaderClient not delegated in the WebKit // implementation; and some WebView additions. -#ifndef WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ -#define WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ +#ifndef WEBKIT_GLUE_WEBVIEW_DELEGATE_H__ +#define WEBKIT_GLUE_WEBVIEW_DELEGATE_H__ #include <string> #include <vector> @@ -93,7 +93,7 @@ class WebFileChooserCallback { virtual void OnFileChoose(const std::vector<std::wstring>& file_names) { } private: - DISALLOW_COPY_AND_ASSIGN(WebFileChooserCallback); + DISALLOW_EVIL_CONSTRUCTORS(WebFileChooserCallback); }; @@ -518,10 +518,6 @@ class WebViewDelegate : virtual public WebWidgetDelegate { return false; } - // Sets the status bar text. - virtual void SetStatusbarText(WebView* webview, - const std::wstring& message) { } - // Displays a "before unload" confirm panel associated with the given view. // The panel should have two buttons, e.g. "OK" and "Cancel", where OK means // that the navigation should continue, and Cancel means that the navigation @@ -776,7 +772,8 @@ class WebViewDelegate : virtual public WebWidgetDelegate { virtual ~WebViewDelegate() { } private: - DISALLOW_COPY_AND_ASSIGN(WebViewDelegate); + DISALLOW_EVIL_CONSTRUCTORS(WebViewDelegate); }; -#endif // WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ +#endif // WEBKIT_GLUE_WEBVIEW_DELEGATE_H__ + |