Merge 64807 & 64824 - Cloud Print Dialog work

chrome/browser/printing/print_dialog_cloud_internal.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_PRINT_DIALOG_CLOUD_INTERNAL_H_
 #define CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 102 matching lines @@
   void HandleSendPrintData(const ListValue* args);
   void HandleSetPageParameters(const ListValue* args);
 
   // Call to get the debugger loaded on our hosted dialog page
   // specifically.  Since we're not in an official browser tab, only
   // way to get the debugger going.
   void ShowDebugger();
 
   virtual void SetDialogDelegate(CloudPrintHtmlDialogDelegate *delegate);
   void CancelAnyRunningTask();
+  void StoreDialogClientSize() const;
 
  private:
   // For unit testing.
   virtual scoped_refptr<CloudPrintDataSender> CreateCloudPrintDataSender();
 
   CloudPrintHtmlDialogDelegate* dialog_delegate_;
   NotificationRegistrar registrar_;
   FilePath path_to_pdf_;
   string16 print_job_title_;
   scoped_refptr<CloudPrintDataSender> print_data_sender_;
@@ skipping 16 matching lines @@
   // HTMLDialogUIDelegate implementation:
   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;
 
  private:
   friend class ::CloudPrintHtmlDialogDelegateTest;
 
   CloudPrintHtmlDialogDelegate(CloudPrintFlowHandler* flow_handler,
                                int width, int height,
                                const std::string& json_arguments);
   void Init(int width, int height, const std::string& json_arguments);
 
   CloudPrintFlowHandler* flow_handler_;
   mutable bool owns_flow_handler_;
 
   // The parameters needed to display a modal HTML dialog.
   HtmlDialogUI::HtmlDialogParams params_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPrintHtmlDialogDelegate);
 };
 
 }  // namespace internal_cloud_print_helpers
 
 #endif  // CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_