| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/macros.h" | 5 #include "base/macros.h" |
| 6 #include "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
| 7 #include "chrome/browser/ui/browser_window.h" | 7 #include "chrome/browser/ui/browser_window.h" |
| 8 #include "chrome/browser/ui/chrome_select_file_policy.h" | 8 #include "chrome/browser/ui/chrome_select_file_policy.h" |
| 9 #include "chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk2.h" | 9 #include "chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.h" |
| 10 #include "chrome/browser/ui/view_ids.h" | 10 #include "chrome/browser/ui/view_ids.h" |
| 11 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
| 12 #include "chrome/test/base/interactive_test_utils.h" | 12 #include "chrome/test/base/interactive_test_utils.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | 13 #include "chrome/test/base/ui_test_utils.h" |
| 14 #include "net/test/embedded_test_server/embedded_test_server.h" | 14 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 15 #include "ui/shell_dialogs/select_file_dialog.h" | 15 #include "ui/shell_dialogs/select_file_dialog.h" |
| 16 #include "ui/views/test/widget_test.h" | 16 #include "ui/views/test/widget_test.h" |
| 17 #include "ui/views/widget/widget.h" | 17 #include "ui/views/widget/widget.h" |
| 18 | 18 |
| 19 using BrowserSelectFileDialogTest = InProcessBrowserTest; | 19 using BrowserSelectFileDialogTest = InProcessBrowserTest; |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 file_picker.Close(); | 104 file_picker.Close(); |
| 105 | 105 |
| 106 // Run a nested loop until the browser window becomes active. | 106 // Run a nested loop until the browser window becomes active. |
| 107 views::test::WidgetActivationWaiter wait_active(widget, true); | 107 views::test::WidgetActivationWaiter wait_active(widget, true); |
| 108 wait_active.Wait(); | 108 wait_active.Wait(); |
| 109 | 109 |
| 110 ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER); | 110 ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER); |
| 111 EXPECT_TRUE(browser()->window()->IsActive()); | 111 EXPECT_TRUE(browser()->window()->IsActive()); |
| 112 } | 112 } |
| OLD | NEW |