Merge 64807 & 64824 - Cloud Print Dialog work

chrome/browser/views/select_file_dialog.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/shell_dialogs.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/json/json_reader.h"
@@ skipping 97 matching lines @@
     virtual bool IsDialogModal() const;
     virtual std::wstring GetDialogTitle() const;
     virtual GURL GetDialogContentURL() const;
     virtual void GetDOMMessageHandlers(
         std::vector<DOMMessageHandler*>* handlers) const;
     virtual void GetDialogSize(gfx::Size* size) const;
     virtual std::string GetDialogArgs() const;
     virtual void OnDialogClosed(const std::string& json_retval);
     virtual void OnCloseContents(TabContents* source, bool* out_close_dialog) {
     }
+    virtual bool ShouldShowDialogTitle() const { return true; }
 
     DISALLOW_COPY_AND_ASSIGN(FileBrowseDelegate);
   };
 
   class FileBrowseDelegateHandler : public DOMMessageHandler {
    public:
     explicit FileBrowseDelegateHandler(FileBrowseDelegate* delegate);
 
     // DOMMessageHandler implementation.
     virtual void RegisterMessages();
@@ skipping 345 matching lines @@
     // TODO(xiyuan): Change this when the infrastructure is improved.
     HtmlDialogUIDelegate** delegate = HtmlDialogUI::GetPropertyAccessor().
         GetProperty(dom_ui_->tab_contents()->property_bag());
     HtmlDialogView* containing_view = static_cast<HtmlDialogView*>(*delegate);
     DCHECK(containing_view);
 
     containing_view->GetWindow()->UpdateWindowTitle();
     containing_view->GetWindow()->GetNonClientView()->SchedulePaint();
   }
 }