| Index: chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc
|
| diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc b/chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc
|
| similarity index 95%
|
| rename from chrome/browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc
|
| rename to chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc
|
| index 424c80160ed9f21d111cebd0ee9695edcc752b16..2c7c6715997f37fb75b02ec2a72665aef594948d 100644
|
| --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc
|
| +++ b/chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc
|
| @@ -2,12 +2,11 @@
|
| // 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 "base/macros.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/chrome_select_file_policy.h"
|
| +#include "chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk2.h"
|
| #include "chrome/browser/ui/view_ids.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "chrome/test/base/interactive_test_utils.h"
|
| @@ -19,7 +18,7 @@
|
|
|
| using BrowserSelectFileDialogTest = InProcessBrowserTest;
|
|
|
| -namespace libgtk2ui {
|
| +namespace libgtkui {
|
|
|
| // FilePicker opens a GtkFileChooser.
|
| class FilePicker : public ui::SelectFileDialog::Listener {
|
| @@ -66,7 +65,7 @@ class FilePicker : public ui::SelectFileDialog::Listener {
|
| DISALLOW_COPY_AND_ASSIGN(FilePicker);
|
| };
|
|
|
| -} // namespace libgtk2ui
|
| +} // namespace libgtkui
|
|
|
| // Test that the file-picker is modal.
|
| IN_PROC_BROWSER_TEST_F(BrowserSelectFileDialogTest, ModalTest) {
|
| @@ -76,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(BrowserSelectFileDialogTest, ModalTest) {
|
|
|
| // Leaks in GtkFileChooserDialog. http://crbug.com/537468
|
| ANNOTATE_SCOPED_MEMORY_LEAK;
|
| - libgtk2ui::FilePicker file_picker(browser()->window());
|
| + libgtkui::FilePicker file_picker(browser()->window());
|
|
|
| gfx::NativeWindow window = browser()->window()->GetNativeWindow();
|
| views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
|
|
|