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

Unified Diff: chrome/test/base/ui_test_utils_linux.cc

Issue 8190012: make browser_tests and interaction_ui_tests compile and link under use_aura=1 chromeos=0. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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/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

Powered by Google App Engine
This is Rietveld 408576698