From eb6c8c24620c8f9f8afd3523cac74f03df0cfe52 Mon Sep 17 00:00:00 2001 From: "finnur@google.com" Date: Mon, 9 Feb 2009 19:08:00 +0000 Subject: Retrying previous changelist. I can't get this to fail locally so I am checking this in again and debugging live. TBR=nsylvain (already reviewed by mbelshe) Review URL: http://codereview.chromium.org/21175 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9398 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webview_delegate.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'webkit/glue/webview_delegate.h') diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index 955985e..2fe2351 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 #include @@ -93,7 +93,7 @@ class WebFileChooserCallback { virtual void OnFileChoose(const std::vector& file_names) { } private: - DISALLOW_EVIL_CONSTRUCTORS(WebFileChooserCallback); + DISALLOW_COPY_AND_ASSIGN(WebFileChooserCallback); }; @@ -518,6 +518,10 @@ 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 @@ -772,8 +776,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { virtual ~WebViewDelegate() { } private: - DISALLOW_EVIL_CONSTRUCTORS(WebViewDelegate); + DISALLOW_COPY_AND_ASSIGN(WebViewDelegate); }; -#endif // WEBKIT_GLUE_WEBVIEW_DELEGATE_H__ - +#endif // WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ -- cgit v1.1