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"
 
 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();

[danakj, 2016/08/11 21:48:19]

Using a time is better if we can. Not being familiar with our X11 event handlers
and all, would it be possible to do something like

int time = ui::X11EventSource::GetInstance()->SomeServerTimeFunction() which
does

if (we're reacting to an X event handler with a time stamp like keypress or
whatever)
  return the X event's timestamp;
else
  return UpdateLastSeenServerTime();


I see you added DesktopWindowTreeHostX11::GetTimestamp() which is basically
this. I think it'd make sense to put that function on X11EventSource and use it
for these presents. What do you think?

[Tom (Use chromium acct), 2016/08/15 18:42:45]

:(

../../chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc:370: error: undefined
reference to 'ui::X11EventSource::GetInstance()'
../../chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc:370: error: undefined
reference to 'ui::X11EventSource::GetTimestamp()'
../../chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc:173: error:
undefined reference to 'ui::X11EventSource::GetInstance()'
../../chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc:173: error:
undefined reference to 'ui::X11EventSource::GetTimestamp()'

I agree this sounds like the right thing to do.  Maybe we could split off
x11_events_platform into it's own .so, or provide a proxy in views?

Here's a list of possible places we could put it

thomasanderson@thomasanderson:~/Developer/chromium_6/src$ ldd
out/Debug/libgtk2ui.so
	linux-vdso.so.1 =>  (0x00007ffe5f9d5000)
	libbase.so => not found
	libbase_i18n.so => not found
	libprinting.so => not found
	libskia.so => not found
	libaura.so => not found
	libui_base.so => not found
	libui_base_ime.so => not found
	libdisplay.so => not found
	libevents.so => not found
	libevents_base.so => not found
	libgfx.so => not found
	libgeometry.so => not found
	libgfx_x11.so => not found
	libnative_theme.so => not found
	libshell_dialogs.so => not found
	libviews.so => not found
	libicui18n.so => not found
	libicuuc.so => not found
	libcontent.so => not found
	libgpu.so => not found
	libgles2_utils.so => not found
	librange.so => not found
	libgl_wrapper.so => not found
	libplatform.so => not found
	libgl_init.so => not found
	libipc.so => not found
	libmojo_public_system.so => not found
	libkeycodes_x11.so => not found
	libui_base_x.so => not found
	liburl.so => not found
	libmojo_common_lib.so => not found
	libcc.so => not found
	libaccessibility.so => not found
	liburl_ipc.so => not found
	libcompositor.so => not found

[Tom (Use chromium acct), 2016/08/19 00:26:31]

Turns out the necessary dependency was added in the past few days, so added
GetTimestamp() here.

-  gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
+  gtk_window_present(GTK_WINDOW(dialog_));
 }
 
 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();
   }
 }