| Index: chrome/browser/printing/print_dialog_cloud_internal.h
|
| ===================================================================
|
| --- chrome/browser/printing/print_dialog_cloud_internal.h (revision 138102)
|
| +++ chrome/browser/printing/print_dialog_cloud_internal.h (working copy)
|
| @@ -159,13 +159,13 @@
|
| // is closed.
|
| class CloudPrintWebDialogDelegate : public WebDialogDelegate {
|
| public:
|
| - CloudPrintWebDialogDelegate(const FilePath& path_to_file,
|
| - int width, int height,
|
| + CloudPrintWebDialogDelegate(content::BrowserContext* browser_context,
|
| + gfx::NativeWindow modal_parent,
|
| + const FilePath& path_to_file,
|
| 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 @@
|
| friend class ::CloudPrintWebDialogDelegateTest;
|
|
|
| // For unit testing.
|
| - CloudPrintWebDialogDelegate(CloudPrintFlowHandler* flow_handler,
|
| - int width, int height,
|
| + CloudPrintWebDialogDelegate(const FilePath& path_to_file,
|
| + CloudPrintFlowHandler* flow_handler,
|
| const std::string& json_arguments,
|
| - bool modal,
|
| bool delete_on_close);
|
| - void Init(int width, int height, const std::string& json_arguments);
|
| + void Init(content::BrowserContext* browser_context,
|
| + const std::string& json_arguments);
|
|
|
| bool delete_on_close_;
|
| CloudPrintFlowHandler* flow_handler_;
|
| - bool modal_;
|
| + gfx::NativeWindow modal_parent_;
|
| mutable bool owns_flow_handler_;
|
| FilePath path_to_file_;
|
|
|
| @@ -209,13 +209,16 @@
|
| DISALLOW_COPY_AND_ASSIGN(CloudPrintWebDialogDelegate);
|
| };
|
|
|
| -void CreateDialogFullImpl(const FilePath& path_to_file,
|
| +void CreateDialogFullImpl(content::BrowserContext* browser_context,
|
| + gfx::NativeWindow modal_parent,
|
| + 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(const base::Closure& callback);
|
| +void CreateDialogSigninImpl(content::BrowserContext* browser_context,
|
| + gfx::NativeWindow modal_parent,
|
| + const base::Closure& callback);
|
|
|
| void Delete(const FilePath& path_to_file);
|
|
|
|
|