Get printing working in Aura.

Splits printing_context_cairo into gtk and no system dialog versions. No system dialog versions are used in Chrome OS and Aura. BUG=http://code.google.com/p/chromium-os/issues/detail?id=13915 TEST=Build Chrome with Aura. Hit ctrl-p from any web page. Print preview page should come up and should be able to print via Cloud Print. Review URL: http://codereview.chromium.org/8372030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109059 0039d316-1c4b-4281-b951-d872f2087c98
dednal · Nov 8, 2011 · ea5e81d · ea5e81d
1 parent 01632e6
commit ea5e81d
Show file tree

Hide file tree

Showing 12 changed files with 422 additions and 302 deletions.
diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc
@@ -259,7 +259,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopStart() {
   CHECK(sigaction(SIGHUP, &action, NULL) == 0);
 
 #if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS)
-  printing::PrintingContextCairo::SetCreatePrintDialogFunction(
+  printing::PrintingContextGtk::SetCreatePrintDialogFunction(
       &PrintDialogGtk::CreatePrintDialog);
 #endif
 }
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
@@ -93,12 +93,12 @@ class GtkPrinterList {
 
 // static
 printing::PrintDialogGtkInterface* PrintDialogGtk::CreatePrintDialog(
-    PrintingContextCairo* context) {
+    PrintingContextGtk* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return new PrintDialogGtk(context);
 }
 
-PrintDialogGtk::PrintDialogGtk(PrintingContextCairo* context)
+PrintDialogGtk::PrintDialogGtk(PrintingContextGtk* context)
     : callback_(NULL),
       context_(context),
       dialog_(NULL),
@@ -229,7 +229,7 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& job_settings,
 }
 
 void PrintDialogGtk::ShowDialog(
-    PrintingContextCairo::PrintSettingsCallback* callback) {
+    PrintingContextGtk::PrintSettingsCallback* callback) {
   callback_ = callback;
 
   GtkWindow* parent = BrowserList::GetLastActive()->window()->GetNativeHandle();
@@ -341,13 +341,13 @@ void PrintDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
       printing::PrintSettingsInitializerGtk::InitPrintSettings(
           gtk_settings_, page_setup_, ranges_vector, false, &settings);
       context_->InitWithSettings(settings);
-      callback_->Run(PrintingContextCairo::OK);
+      callback_->Run(PrintingContextGtk::OK);
       callback_ = NULL;
       return;
     }
     case GTK_RESPONSE_DELETE_EVENT:  // Fall through.
     case GTK_RESPONSE_CANCEL: {
-      callback_->Run(PrintingContextCairo::CANCEL);
+      callback_->Run(PrintingContextGtk::CANCEL);
       callback_ = NULL;
       return;
     }

diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h
@@ -15,15 +15,15 @@
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_thread.h"
 #include "printing/print_dialog_gtk_interface.h"
-#include "printing/printing_context_cairo.h"
+#include "printing/printing_context_gtk.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 namespace printing {
 class Metafile;
 class PrintSettings;
 }
 
-using printing::PrintingContextCairo;
+using printing::PrintingContextGtk;
 
 // Needs to be freed on the UI thread to clean up its GTK members variables.
 class PrintDialogGtk
@@ -33,15 +33,15 @@ class PrintDialogGtk
  public:
   // Creates and returns a print dialog.
   static printing::PrintDialogGtkInterface* CreatePrintDialog(
-      PrintingContextCairo* context);
+      PrintingContextGtk* context);
 
   // printing::PrintDialogGtkInterface implementation.
   virtual void UseDefaultSettings() OVERRIDE;
   virtual bool UpdateSettings(const base::DictionaryValue& job_settings,
                               const printing::PageRanges& ranges,
                               printing::PrintSettings* settings) OVERRIDE;
   virtual void ShowDialog(
-      PrintingContextCairo::PrintSettingsCallback* callback) OVERRIDE;
+      PrintingContextGtk::PrintSettingsCallback* callback) OVERRIDE;
   virtual void PrintDocument(const printing::Metafile* metafile,
                              const string16& document_name) OVERRIDE;
   virtual void AddRefToDialog() OVERRIDE;
@@ -52,7 +52,7 @@ class PrintDialogGtk
       content::BrowserThread::UI>;
   friend class DeleteTask<PrintDialogGtk>;
 
-  explicit PrintDialogGtk(PrintingContextCairo* context);
+  explicit PrintDialogGtk(PrintingContextGtk* context);
   virtual ~PrintDialogGtk();
 
   // Handles dialog response.
@@ -73,8 +73,8 @@ class PrintDialogGtk
                          printing::PrintSettings* settings);
 
   // Printing dialog callback.
-  PrintingContextCairo::PrintSettingsCallback* callback_;
-  PrintingContextCairo* context_;
+  PrintingContextGtk::PrintSettingsCallback* callback_;
+  PrintingContextGtk* context_;
 
   // Print dialog settings. PrintDialogGtk owns |dialog_| and holds references
   // to the other objects.

diff --git a/printing/print_dialog_gtk_interface.h b/printing/print_dialog_gtk_interface.h
@@ -6,7 +6,7 @@
 #define PRINTING_PRINT_DIALOG_GTK_INTERFACE_H_
 
 #include "base/string16.h"
-#include "printing/printing_context_cairo.h"
+#include "printing/printing_context_gtk.h"
 
 namespace printing {
 
@@ -32,7 +32,7 @@ class PrintDialogGtkInterface {
   // Shows the dialog and handles the response with |callback|. Only used when
   // printing with the native print dialog.
   virtual void ShowDialog(
-      PrintingContextCairo::PrintSettingsCallback* callback) = 0;
+      PrintingContextGtk::PrintSettingsCallback* callback) = 0;
 
   // Prints the document named |document_name| contained in |metafile|.
   // Called from the print worker thread. Once called, the

diff --git a/printing/printed_document_cairo.cc b/printing/printed_document_cairo.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "printing/page_number.h"
 #include "printing/printed_page.h"
-#include "printing/printing_context_cairo.h"
+#include "printing/printing_context_gtk.h"
 
 namespace printing {
 
@@ -27,7 +27,7 @@ void PrintedDocument::RenderPrintedPage(
   {
     base::AutoLock lock(lock_);
     if (page.page_number() - 1 == mutable_.first_page) {
-      reinterpret_cast<PrintingContextCairo*>(context)->PrintDocument(
+      reinterpret_cast<PrintingContextGtk*>(context)->PrintDocument(
           page.metafile());
     }
   }

diff --git a/printing/printing.gyp b/printing/printing.gyp
@@ -66,13 +66,6 @@
         'printed_pages_source.h',
         'printing_context.cc',
         'printing_context.h',
-        'printing_context_aura.cc',
-        'printing_context_cairo.cc',
-        'printing_context_cairo.h',
-        'printing_context_mac.mm',
-        'printing_context_mac.h',
-        'printing_context_win.cc',
-        'printing_context_win.h',
         'print_dialog_gtk_interface.h',
         'print_job_constants.cc',
         'print_job_constants.h',
@@ -117,16 +110,25 @@
             ['exclude', 'metafile_skia_wrapper\\.(cc|h)$'],
           ],
         }],
+        ['OS=="mac" and use_aura==0',{
+          'sources': [
+            'printing_context_mac.mm',
+            'printing_context_mac.h',
+          ],
+        }],
         ['OS=="win"', {
           'conditions': [
             ['use_aura==1', {
               'sources!': [
                 'image_aura.cc',
                 'printed_document_aura.cc',
-                'printing_context_aura.cc',
               ],
-            }],
-          ],
+            }, {  #else: use_aura==0
+              'sources': [
+                'printing_context_win.cc',
+                'printing_context_win.h',
+              ],
+          }]],
           'defines': [
             # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
             # of the print backend and enables a custom implementation instead.
@@ -138,6 +140,12 @@
             'backend/print_backend_win.cc',
           ],
         }],
+        ['chromeos==1 or use_aura==1',{
+          'sources': [
+            'printing_context_no_system_dialog.cc',
+            'printing_context_no_system_dialog.h',
+          ],
+        }],
         ['use_cups==1', {
           'dependencies': [
             'cups',
@@ -170,6 +178,12 @@
             'backend/print_backend_chromeos.cc',
           ],
         }],
+        ['OS=="linux" and chromeos==0', {
+          'sources': [
+            'printing_context_gtk.cc',
+            'printing_context_gtk.h',
+          ],
+        }],
       ],
     },
     {
@@ -189,18 +203,18 @@
         'page_setup_unittest.cc',
         'pdf_metafile_cg_mac_unittest.cc',
         'printed_page_unittest.cc',
-        'printing_context_win_unittest.cc',
         'run_all_unittests.cc',
         'units_unittest.cc',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
+        ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_gtk_unittest\\.cc$']]}],
         ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
-        ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]
-          }, {  # else: OS=="win"
-            'sources/': [['exclude', '_cairo_unittest\\.cc$']]
-          }
-        ],
+        ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]}],
+        ['OS=="win" and use_aura == 0', {
+          'sources': [
+            'printing_context_win_unittest.cc',
+          ]
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',

diff --git a/printing/printing_context_aura.cc b/printing/printing_context_aura.cc