| Index: chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
|
| diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
|
| index 258a454df89eac206f87da474c03bfb00a0b692a..f9c8b53c89113cc51bcedcca340b967650670e0f 100644
|
| --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
|
| +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
|
| @@ -2,7 +2,6 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include <gdk/gdkx.h>
|
| #include <gtk/gtk.h>
|
| #include <map>
|
| #include <set>
|
| @@ -26,7 +25,6 @@
|
| #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 {
|
| @@ -274,11 +272,9 @@
|
|
|
| params_map_[dialog] = params;
|
|
|
| - // Disable input events handling in the host window 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);
|
|
|
| @@ -529,12 +525,6 @@
|
| 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);
|
|
|