| Index: chrome/test/base/ui_test_utils_linux.cc
|
| diff --git a/chrome/test/base/ui_test_utils_linux.cc b/chrome/test/base/ui_test_utils_linux.cc
|
| index f890d7db82f11692fa49bb0d599ab86d980f6797..df747f29493e87cc19607894217d9b9f92e8f1eb 100644
|
| --- a/chrome/test/base/ui_test_utils_linux.cc
|
| +++ b/chrome/test/base/ui_test_utils_linux.cc
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "chrome/test/base/ui_test_utils.h"
|
|
|
| +#if !defined(USE_AURA)
|
| #include <gtk/gtk.h>
|
| +#endif
|
|
|
| #include "base/logging.h"
|
| #include "base/message_loop.h"
|
| @@ -19,7 +21,7 @@
|
|
|
| namespace ui_test_utils {
|
|
|
| -#if !defined(TOOLKIT_VIEWS)
|
| +#if !defined(TOOLKIT_VIEWS) && !defined(USE_AURA)
|
| namespace {
|
|
|
| // Check if the focused widget for |root| is |target| or a child of |target|.
|
| @@ -84,14 +86,18 @@ void ClickOnView(const Browser* browser, ViewID vid) {
|
| }
|
|
|
| void HideNativeWindow(gfx::NativeWindow window) {
|
| +#if !defined(USE_AURA)
|
| gtk_widget_hide(GTK_WIDGET(window));
|
| +#endif
|
| }
|
|
|
| void ShowAndFocusNativeWindow(gfx::NativeWindow window) {
|
| +#if !defined(USE_AURA)
|
| if (gtk_window_has_toplevel_focus(GTK_WINDOW(window)))
|
| return;
|
|
|
| gtk_window_present(GTK_WINDOW(window));
|
| +#endif
|
| }
|
|
|
| } // namespace ui_test_utils
|
|
|