Merge 64807 & 64824 - Cloud Print Dialog work

chrome/browser/views/html_dialog_view.cc

Index: chrome/browser/views/html_dialog_view.cc
===================================================================
--- chrome/browser/views/html_dialog_view.cc	(revision 64933)
+++ chrome/browser/views/html_dialog_view.cc	(working copy)
@@ -98,6 +98,10 @@
   return this;
 }
 
+bool HtmlDialogView::ShouldShowWindowTitle() const {
+  return ShouldShowDialogTitle();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogUIDelegate implementation:
 
@@ -150,6 +154,13 @@
     delegate_->OnCloseContents(source, out_close_dialog);
 }
 
+bool HtmlDialogView::ShouldShowDialogTitle() const {
+  if (delegate_)
+    return delegate_->ShouldShowDialogTitle();
+  else
+    return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsDelegate implementation: