Revert of Make File-Picker modal on Linux

chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

 // Copyright (c) 2012 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/select_file_dialog_impl_gtk2.h"
 
-#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <map>
 #include <set>
 #include <vector>
 
 // Xlib defines RootWindow
 #undef RootWindow
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 #include "ui/strings/grit/ui_strings.h"
-#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 
 namespace {
 
 // Makes sure that .jpg also shows .JPG.
 gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
                                    std::string* file_extension) {
   return base::EndsWith(file_info->filename, *file_extension,
                         base::CompareCase::INSENSITIVE_ASCII);
 }
@@ skipping 112 matching lines @@
 
   preview_ = gtk_image_new();
   g_signal_connect(dialog, "destroy",
                    G_CALLBACK(OnFileChooserDestroyThunk), this);
   g_signal_connect(dialog, "update-preview",
                    G_CALLBACK(OnUpdatePreviewThunk), this);
   gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog), preview_);
 
   params_map_[dialog] = params;
 
-  if (owning_window && owning_window->GetHost()) {
-    // Disable input events handling in the host to make this dialog modal.
-    views::DesktopWindowTreeHostX11* host =
-        views::DesktopWindowTreeHostX11::GetHostForXID(
-        owning_window->GetHost()->GetAcceleratedWidget());
-    host->DisableEventListening(GDK_WINDOW_XID(gtk_widget_get_window(dialog)));
-  }
+  // TODO(erg): Figure out how to fake GTK window-to-parent modality without
+  // having the parent be a real GtkWindow.
+  gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
 
   gtk_widget_show_all(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);
 }
 
 void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {
@@ skipping 238 matching lines @@
   dialogs_.erase(dialog);
 
   // Parent may be NULL in a few cases: 1) on shutdown when
   // AllBrowsersClosed() trigger this handler after all the browser
   // windows got destroyed, or 2) when the parent tab has been opened by
   // 'Open Link in New Tab' context menu on a downloadable item and
   // the tab has no content (see the comment in SelectFile as well).
   aura::Window* parent = GetAuraTransientParent(dialog);
   if (!parent)
     return;
-
-  views::DesktopWindowTreeHostX11* host =
-      views::DesktopWindowTreeHostX11::GetHostForXID(
-      parent->GetHost()->GetAcceleratedWidget());
-  host->EnableEventListening();
-
   std::set<aura::Window*>::iterator iter = parents_.find(parent);
   if (iter != parents_.end()) {
     (*iter)->RemoveObserver(this);
     parents_.erase(iter);
   } else {
     NOTREACHED();
   }
 }
 
 bool SelectFileDialogImplGTK::IsCancelResponse(gint response_id) {
@@ skipping 103 matching lines @@
   g_free(filename);
   if (pixbuf) {
     gtk_image_set_from_pixbuf(GTK_IMAGE(preview_), pixbuf);
     g_object_unref(pixbuf);
   }
   gtk_file_chooser_set_preview_widget_active(GTK_FILE_CHOOSER(chooser),
                                              pixbuf ? TRUE : FALSE);
 }
 
 }  // namespace libgtk2ui