| Index: chrome/test/base/interactive_test_utils_win.cc
|
| diff --git a/chrome/test/base/interactive_test_utils_win.cc b/chrome/test/base/interactive_test_utils_win.cc
|
| index a99d65d3f8c1c95254933f31c9ec99f35b25ec6c..83f657cd98abea01a16cca4a9ad67ca8d1797563 100644
|
| --- a/chrome/test/base/interactive_test_utils_win.cc
|
| +++ b/chrome/test/base/interactive_test_utils_win.cc
|
| @@ -11,7 +11,6 @@
|
| #include "base/macros.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/time/time.h"
|
| -#include "chrome/browser/ui/host_desktop.h"
|
| #include "chrome/test/base/interactive_test_utils_aura.h"
|
| #include "ui/aura/window_tree_host.h"
|
| #include "ui/base/test/ui_controls.h"
|
| @@ -21,19 +20,18 @@
|
| namespace ui_test_utils {
|
|
|
| void HideNativeWindow(gfx::NativeWindow window) {
|
| - if (chrome::GetHostDesktopTypeForNativeWindow(window) ==
|
| - chrome::HOST_DESKTOP_TYPE_ASH) {
|
| - HideNativeWindowAura(window);
|
| - return;
|
| - }
|
| +#if defined(USE_ASH)
|
| + HideNativeWindowAura(window);
|
| +#else
|
| HWND hwnd = window->GetHost()->GetAcceleratedWidget();
|
| ::ShowWindow(hwnd, SW_HIDE);
|
| +#endif // USE_ASH
|
| }
|
|
|
| bool ShowAndFocusNativeWindow(gfx::NativeWindow window) {
|
| - if (chrome::GetHostDesktopTypeForNativeWindow(window) ==
|
| - chrome::HOST_DESKTOP_TYPE_ASH)
|
| - ShowAndFocusNativeWindowAura(window);
|
| +#if defined(USE_ASH)
|
| + ShowAndFocusNativeWindowAura(window);
|
| +#endif // USE_ASH
|
| window->Show();
|
| // Always make sure the window hosting ash is visible and focused.
|
| HWND hwnd = window->GetHost()->GetAcceleratedWidget();
|
|
|