Merge 64807 & 64824 - Cloud Print Dialog work

chrome/browser/browser_signin.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/browser_signin.h"
 
 #include <string>
 #include <vector>
 
 #include "app/resource_bundle.h"
@@ skipping 92 matching lines @@
   }
   virtual std::string GetDialogArgs() const {
     return UTF16ToASCII(login_message_);
   }
   virtual void OnDialogClosed(const std::string& json_retval) {
     closed_ = true;
     signin_->Cancel();
   }
   virtual void OnCloseContents(TabContents* source, bool* out_close_dialog) {
   }
+  virtual bool ShouldShowDialogTitle() const { return true; }
 
   // DOMMessageHandler implementation.
   virtual void RegisterMessages();
 
   // Refreshes the UI, such as after an authentication error.
   void ReloadUI();
 
   // Method which calls into javascript to force the dialog to close.
   void ForceDialogClose();
 
@@ skipping 198 matching lines @@
 
 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) {
 //  TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog.
 #if defined(OS_WIN) || !defined(TOOLKIT_VIEWS)
   html_dialog_ui_delegate_ = CreateHtmlDialogUI();
   ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_,
                                                  html_dialog_ui_delegate_,
                                                  tab_contents);
 #endif
 }