Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Unified Diff: chrome/browser/printing/print_dialog_cloud_internal.h

Issue 10388214: Make cloud print dialog creation function not use browser list, instead obtain profile and parent w… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/printing/print_dialog_cloud_internal.h
===================================================================
--- chrome/browser/printing/print_dialog_cloud_internal.h (revision 138829)
+++ 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,18 +190,19 @@
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_;
+ bool keep_alive_when_non_modal_;
// The parameters needed to display a modal web dialog.
WebDialogUI::WebDialogParams params_;
@@ -209,13 +210,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);

Powered by Google App Engine
This is Rietveld 408576698