Simplify GCP integration with print preview.

Removes GCP printers from the printer dropdown on platforms other than Chrome OS.
Adds an option to the printer dropdown to close print preview and print via the cloud print dialog.

BUG=
TEST=Cloud print printers should only appear in print preview in chrome os.
If cloud print is enabled, a new option should appear in the print preview dropdown that closes print preview and brings up the cloud print dialog.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=101256

Review URL: http://codereview.chromium.org/7830013

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

1 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h
index 6e04242..995b9a6 100644
--- a/chrome/browser/printing/print_dialog_cloud_internal.h
+++ b/chrome/browser/printing/print_dialog_cloud_internal.h
@@ -158,7 +158,8 @@ class CloudPrintHtmlDialogDelegate : public HtmlDialogUIDelegate {
                                const string16& print_job_title,
                                const string16& print_ticket,
                                const std::string& file_type,
-                               bool modal);
+                               bool modal,
+                               bool delete_on_close);
   virtual ~CloudPrintHtmlDialogDelegate();
 
   // HTMLDialogUIDelegate implementation:
@@ -182,9 +183,11 @@ class CloudPrintHtmlDialogDelegate : public HtmlDialogUIDelegate {
   CloudPrintHtmlDialogDelegate(CloudPrintFlowHandler* flow_handler,
                                int width, int height,
                                const std::string& json_arguments,
-                               bool modal);
+                               bool modal,
+                               bool delete_on_close);
   void Init(int width, int height, const std::string& json_arguments);
 
+  bool delete_on_close_;
   CloudPrintFlowHandler* flow_handler_;
   bool modal_;
   mutable bool owns_flow_handler_;
@@ -200,7 +203,8 @@ void CreateDialogImpl(const FilePath& path_to_file,
                       const string16& print_job_title,
                       const string16& print_ticket,
                       const std::string& file_type,
-                      bool modal);
+                      bool modal,
+                      bool delete_on_close);
 
 void Delete(const FilePath& path_to_file);