Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc

Issue 10383213: Attempt at fixing crash in constrained window used by printing. I (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index 499ed6d469a2a0aa9e5d732f1c3641e7d815addf..689b8c503826482b52f742e4875ae7fdd947f0be 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -102,7 +102,8 @@ class ConstrainedWebDialogDelegateViewViews
return View::GetWidget();
}
virtual string16 GetWindowTitle() const OVERRIDE {
- return GetWebDialogDelegate()->GetDialogTitle();
+ return impl_->closed_via_webui() ? string16() :
+ GetWebDialogDelegate()->GetDialogTitle();
}
virtual views::View* GetContentsView() OVERRIDE {
return this;
@@ -111,7 +112,8 @@ class ConstrainedWebDialogDelegateViewViews
// views::WebView overrides.
virtual gfx::Size GetPreferredSize() OVERRIDE {
gfx::Size size;
- GetWebDialogDelegate()->GetDialogSize(&size);
+ if (!impl_->closed_via_webui())
+ GetWebDialogDelegate()->GetDialogSize(&size);
return size;
}
« no previous file with comments | « no previous file | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698