Initial gtk3 support

chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h"
 
 #include <gtk/gtkunixprint.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 470 matching lines @@
       callback_.Reset();
       return;
     }
     case GTK_RESPONSE_APPLY:
     default: {
       NOTREACHED();
     }
   }
 }
 
+
+
+static void OnJobCompletedThunk(GtkPrintJob* print_job,
+                                gpointer user_data,
+                                const GError* error) {
+  static_cast<PrintDialogGtk2*>(user_data)->OnJobCompleted(print_job, error);
+}

[Elliot Glaysher, 2015/07/20 19:31:40]

Why was the thunk moved here? If you left it as a static member you wouldn't
have to move this.

[knthzh, 2015/07/21 15:48:27]

I think I just wanted to remove it from the public header interface. Should I
put it back?

 void PrintDialogGtk2::SendDocumentToPrinter(
     const base::string16& document_name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If |printer_| is NULL then somehow the GTK printer list changed out under
   // us. In which case, just bail out.
   if (!printer_) {
     // Matches AddRef() in PrintDocument();
     Release();
     return;
   }
 
   // Save the settings for next time.
   g_last_used_settings.Get().SetLastUsedSettings(gtk_settings_);
 
   GtkPrintJob* print_job = gtk_print_job_new(
       base::UTF16ToUTF8(document_name).c_str(),
       printer_,
       gtk_settings_,
       page_setup_);
   gtk_print_job_set_source_file(print_job, path_to_pdf_.value().c_str(), NULL);
   gtk_print_job_send(print_job, OnJobCompletedThunk, this, NULL);
 }
 
-// static
-void PrintDialogGtk2::OnJobCompletedThunk(GtkPrintJob* print_job,
-                                         gpointer user_data,
-                                         GError* error) {
-  static_cast<PrintDialogGtk2*>(user_data)->OnJobCompleted(print_job, error);
-}
-
-void PrintDialogGtk2::OnJobCompleted(GtkPrintJob* print_job, GError* error) {
+void PrintDialogGtk2::OnJobCompleted(GtkPrintJob* print_job, const GError* error) {
   if (error)
     LOG(ERROR) << "Printing failed: " << error->message;
   if (print_job)
     g_object_unref(print_job);
   base::FileUtilProxy::DeleteFile(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE).get(),
       path_to_pdf_,
       false,
       base::FileUtilProxy::StatusCallback());
   // Printing finished. Matches AddRef() in PrintDocument();
   Release();
 }
 
 void PrintDialogGtk2::InitPrintSettings(PrintSettings* settings) {
   InitPrintSettingsGtk(gtk_settings_, page_setup_, settings);
   context_->InitWithSettings(*settings);
 }
 
 void PrintDialogGtk2::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(libgtk2ui::GetAuraTransientParent(dialog_), window);
 
   libgtk2ui::ClearAuraTransientParent(dialog_);
   window->RemoveObserver(this);
   Release();
 }