Linux: Refactor X11DesktopHandler

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>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/file_util_proxy.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #include "chrome/browser/ui/libgtk2ui/printing_gtk2_util.h"
 #include "printing/metafile.h"
 #include "printing/print_job_constants.h"
 #include "printing/print_settings.h"
 #include "ui/aura/window.h"
-#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
+#include "ui/events/platform/x11/x11_event_source.h"
 
 using content::BrowserThread;
 using printing::PageRanges;
 using printing::PrintSettings;
 
 namespace {
 
 #if defined(USE_CUPS)
 // CUPS Duplex attribute and values.
 const char kCUPSDuplex[] = "cups-Duplex";
@@ skipping 320 matching lines @@
                                               TRUE);
   gtk_print_unix_dialog_set_has_selection(GTK_PRINT_UNIX_DIALOG(dialog_),
                                           has_selection);
   gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(dialog_),
                                      gtk_settings_);
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
   gtk_widget_show(dialog_);
 
   // We need to call gtk_window_present after making the widgets visible to make
   // sure window gets correctly raised and gets focus.
-  int time = views::X11DesktopHandler::get()->wm_user_time_ms();
-  gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
+  gtk_window_present_with_time(
+      GTK_WINDOW(dialog_), ui::X11EventSource::GetInstance()->GetTimestamp());
 }
 
 void PrintDialogGtk2::PrintDocument(const printing::MetafilePlayer& metafile,
                                     const base::string16& document_name) {
   // This runs on the print worker thread, does not block the UI thread.
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // The document printing tasks can outlive the PrintingContext that created
   // this dialog.
   AddRef();
@@ skipping 168 matching lines @@
 void PrintDialogGtk2::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(libgtk2ui::GetAuraTransientParent(dialog_), window);
 
   libgtk2ui::ClearAuraTransientParent(dialog_);
   window->RemoveObserver(this);
   if (!callback_.is_null()) {
     callback_.Run(PrintingContextLinux::CANCEL);
     callback_.Reset();
   }
 }