Revert cloud print dialog changes.

BUG=none
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138496 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 14 deletions

diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h
index 36c4ed8..3e4ef6c 100644
--- a/chrome/browser/printing/print_dialog_cloud_internal.h
+++ b/chrome/browser/printing/print_dialog_cloud_internal.h
@@ -159,13 +159,13 @@ class CloudPrintFlowHandler : public content::WebUIMessageHandler,
 // is closed.
 class CloudPrintWebDialogDelegate : public WebDialogDelegate {
  public:
-  CloudPrintWebDialogDelegate(content::BrowserContext* browser_context,
-                              gfx::NativeWindow modal_parent,
-                              const FilePath& path_to_file,
+  CloudPrintWebDialogDelegate(const FilePath& path_to_file,
+                              int width, int height,
                               const std::string& json_arguments,
                               const string16& print_job_title,
                               const string16& print_ticket,
                               const std::string& file_type,
+                              bool modal,
                               bool delete_on_close,
                               bool close_after_signin,
                               const base::Closure& callback);
@@ -190,16 +190,16 @@ class CloudPrintWebDialogDelegate : public WebDialogDelegate {
   friend class ::CloudPrintWebDialogDelegateTest;
 
   // For unit testing.
-  CloudPrintWebDialogDelegate(const FilePath& path_to_file,
-                              CloudPrintFlowHandler* flow_handler,
+  CloudPrintWebDialogDelegate(CloudPrintFlowHandler* flow_handler,
+                              int width, int height,
                               const std::string& json_arguments,
+                              bool modal,
                               bool delete_on_close);
-  void Init(content::BrowserContext* browser_context,
-            const std::string& json_arguments);
+  void Init(int width, int height, const std::string& json_arguments);
 
   bool delete_on_close_;
   CloudPrintFlowHandler* flow_handler_;
-  gfx::NativeWindow modal_parent_;
+  bool modal_;
   mutable bool owns_flow_handler_;
   FilePath path_to_file_;
 
@@ -209,16 +209,13 @@ class CloudPrintWebDialogDelegate : public WebDialogDelegate {
   DISALLOW_COPY_AND_ASSIGN(CloudPrintWebDialogDelegate);
 };
 
-void CreateDialogFullImpl(content::BrowserContext* browser_context,
-                          gfx::NativeWindow modal_parent,
-                          const FilePath& path_to_file,
+void CreateDialogFullImpl(const FilePath& path_to_file,
                           const string16& print_job_title,
                           const string16& print_ticket,
                           const std::string& file_type,
+                          bool modal,
                           bool delete_on_close);
-void CreateDialogSigninImpl(content::BrowserContext* browser_context,
-                            gfx::NativeWindow modal_parent,
-                            const base::Closure& callback);
+void CreateDialogSigninImpl(const base::Closure& callback);
 
 void Delete(const FilePath& path_to_file);