Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4552)

Unified Diff: chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

Issue 1363093004: Add BrowserSelectFileDialogTest.OpenCloseFileDialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enable the test and skip libglib-2.0 from LSan report Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6a0cb7cb8957ab5ace97619c5bbc2c51ddd44b7f..66672a8cb42c44fe757440fe5e68b270b4a71dc9 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
@@ -29,6 +29,7 @@
#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 {
@@ -73,6 +74,8 @@ class SelectFileDialogImplGTK : public SelectFileDialogImpl,
const base::FilePath::StringType& default_extension,
gfx::NativeWindow owning_window,
void* params) override;
+ // Close the file dialog.
+ void CloseImpl() override;
private:
bool HasMultipleFileTypeChoicesImpl() override;
@@ -289,6 +292,25 @@ void SelectFileDialogImplGTK::SelectFileImpl(
gtk_window_present_with_time(GTK_WINDOW(dialog), time);
}
+// Close the file-picker by sending an ESC key event to it.
+void SelectFileDialogImplGTK::CloseImpl() {
+ // Get the focused window.
msw 2015/10/16 17:01:04 Can we ensure this is the dialog window somehow? O
joone 2015/10/16 23:33:46 Yes, because the file-picker is modal.
+ XID focused_window;
+ int revert;
+ XGetInputFocus(gfx::GetXDisplay(), &focused_window, &revert);
+
+ // Send an ESC key event to the focused_window.
+ XKeyEvent event;
+ memset(&event, 0, sizeof(event));
+ event.display = gfx::GetXDisplay();
+ event.window = focused_window;
+ event.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Escape);
+ event.type = KeyPress;
+
+ XSendEvent(gfx::GetXDisplay(), focused_window, True, KeyPressMask,
+ reinterpret_cast<XEvent*>(&event));
+}
+
void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {
for (size_t i = 0; i < file_types_.extensions.size(); ++i) {
GtkFileFilter* filter = NULL;

Powered by Google App Engine
This is Rietveld 408576698