Merge 64807 & 64824 - Cloud Print Dialog work

chrome/browser/printing/cloud_print/cloud_print_setup_flow.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_SETUP_FLOW_H_
 #define CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_SETUP_FLOW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 52 matching lines @@
   // HtmlDialogUIDelegate implementation.
   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 std::wstring GetDialogTitle() const;
   virtual bool IsDialogModal() const;
+  virtual bool ShouldShowDialogTitle() const { return true; }
 
   // GaiaAuthConsumer implementation.
   virtual void OnClientLoginFailure(
       const GoogleServiceAuthError& error);
   virtual void OnClientLoginSuccess(
       const GaiaAuthConsumer::ClientLoginResult& credentials);
 
  private:
   friend class CloudPrintServiceProcessHelper;
   friend class CloudPrintSetupMessageHandler;
@@ skipping 35 matching lines @@
   std::string lsid_;
 
   // Handle to the ServiceProcessControl which talks to the service process.
   ServiceProcessControl* process_control_;
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPrintSetupFlow);
 };
 
 #endif  // CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_SETUP_FLOW_H_