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

3 files changed, 18 insertions, 24 deletions

diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 18269e1..6a04764 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -60,7 +60,7 @@ class WebFileChooserCallbackImpl : public WebFileChooserCallback {
 
  private:
   RefPtr<WebCore::FileChooser> file_chooser_;
-  DISALLOW_COPY_AND_ASSIGN(WebFileChooserCallbackImpl);
+  DISALLOW_EVIL_CONSTRUCTORS(WebFileChooserCallbackImpl);
 };
 
 ChromeClientImpl::ChromeClientImpl(WebViewImpl* webview)
@@ -295,7 +295,7 @@ bool ChromeClientImpl::runBeforeUnloadConfirmPanel(const WebCore::String& messag
 void ChromeClientImpl::closeWindowSoon() {
   // Make sure this Page can no longer be found by JS.
   webview_->page()->setGroupName(WebCore::String());
-
+  
   // Make sure that all loading is stopped.  Ensures that JS stops executing!
   webview_->StopLoading();
 
@@ -348,12 +348,8 @@ bool ChromeClientImpl::runJavaScriptPrompt(WebCore::Frame* frame,
   return false;
 }
 
-void ChromeClientImpl::setStatusbarText(const WebCore::String& message) {
-  WebViewDelegate* d = webview_->delegate();
-  if (d) {
-    std::wstring wstr = webkit_glue::StringToStdWString(message);
-    d->SetStatusbarText(webview_, wstr);
-  }
+void ChromeClientImpl::setStatusbarText(const WebCore::String&) {
+  // TODO(mbelshe): implement me
 }
 
 bool ChromeClientImpl::shouldInterruptJavaScript() {
@@ -374,7 +370,7 @@ WebCore::IntRect ChromeClientImpl::windowResizerRect() const {
   if (webview_->delegate()) {
     gfx::Rect resizer_rect;
     webview_->delegate()->GetRootWindowResizerRect(webview_, &resizer_rect);
-    rv = WebCore::IntRect(resizer_rect.x(),
+    rv = WebCore::IntRect(resizer_rect.x(), 
                           resizer_rect.y(),
                           resizer_rect.width(),
                           resizer_rect.height());
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index 2c6fc22..8ac4916 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_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_CHROME_CLIENT_IMPL_H_
-#define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
+#ifndef WEBKIT_GLUE_CHROME_CLIENT_IMPL_H__
+#define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H__
 
 #include "base/compiler_specific.h"
 
@@ -21,7 +21,7 @@ struct WindowFeatures;
 
 // Handles window-level notifications from WebCore on behalf of a WebView.
 class ChromeClientImpl : public WebCore::ChromeClientChromium {
- public:
+public:
   ChromeClientImpl(WebViewImpl* webview);
   virtual ~ChromeClientImpl();
 
@@ -81,7 +81,7 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
                                    const WebCore::String& defaultValue,
                                    WebCore::String& result);
 
-  virtual void setStatusbarText(const WebCore::String& message);
+  virtual void setStatusbarText(const WebCore::String&);
   virtual bool shouldInterruptJavaScript();
 
   // Returns true if anchors should accept keyboard focus with the tab key.
@@ -127,7 +127,7 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
 
   virtual void formStateDidChange(const WebCore::Node*);
 
- private:
+private:
   WebViewImpl* webview_;  // weak pointer
   bool toolbars_visible_;
   bool statusbar_visible_;
@@ -138,4 +138,5 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
   bool ignore_next_set_cursor_;
 };
 
-#endif  // WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
+#endif // WEBKIT_GLUE_CHROME_CLIENT_IMPL_H__
+
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__
+