diff options
author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 19:08:00 +0000 |
---|---|---|
committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 19:08:00 +0000 |
commit | eb6c8c24620c8f9f8afd3523cac74f03df0cfe52 (patch) | |
tree | ebe8d80bc42f0384fb9f766ffbbbb61f28785b3a /webkit/glue/chrome_client_impl.cc | |
parent | 7645256a98266bb1fd3904deb30e816614bfa9c2 (diff) | |
download | chromium_src-eb6c8c24620c8f9f8afd3523cac74f03df0cfe52.zip chromium_src-eb6c8c24620c8f9f8afd3523cac74f03df0cfe52.tar.gz chromium_src-eb6c8c24620c8f9f8afd3523cac74f03df0cfe52.tar.bz2 |
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
Diffstat (limited to 'webkit/glue/chrome_client_impl.cc')
-rw-r--r-- | webkit/glue/chrome_client_impl.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index 6a04764..18269e1 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_EVIL_CONSTRUCTORS(WebFileChooserCallbackImpl); + DISALLOW_COPY_AND_ASSIGN(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,8 +348,12 @@ bool ChromeClientImpl::runJavaScriptPrompt(WebCore::Frame* frame, return false; } -void ChromeClientImpl::setStatusbarText(const WebCore::String&) { - // TODO(mbelshe): implement me +void ChromeClientImpl::setStatusbarText(const WebCore::String& message) { + WebViewDelegate* d = webview_->delegate(); + if (d) { + std::wstring wstr = webkit_glue::StringToStdWString(message); + d->SetStatusbarText(webview_, wstr); + } } bool ChromeClientImpl::shouldInterruptJavaScript() { @@ -370,7 +374,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()); |