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

Unified Diff: ash/test/ash_test_base.cc

Issue 400413002: aura: Use PlatformWindow from WindowTreeHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland Created 6 years, 5 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
« no previous file with comments | « ash/ash.gyp ('k') | mojo/services/native_viewport/native_viewport_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index bd31bcc720ac4e6ba978ce4352d908aa0e5b37ea..3bf53dd1075c8de3693540e4273e0504ad48e8eb 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -44,6 +44,7 @@
#include "base/win/windows_version.h"
#include "ui/aura/remote_window_tree_host_win.h"
#include "ui/aura/window_tree_host_win.h"
+#include "ui/platform_window/win/win_window.h"
#include "win8/test/test_registrar_constants.h"
#endif
@@ -123,7 +124,7 @@ void AshTestBase::SetUp() {
switches::kAshHostWindowBounds, "1+1-800x600");
}
#if defined(OS_WIN)
- aura::test::SetUsePopupAsRootWindowForTest(true);
+ ui::test::SetUsePopupAsRootWindowForTest(true);
#endif
ash_test_helper_->SetUp(start_session_);
@@ -173,7 +174,7 @@ void AshTestBase::TearDown() {
ash_test_helper_->TearDown();
#if defined(OS_WIN)
- aura::test::SetUsePopupAsRootWindowForTest(false);
+ ui::test::SetUsePopupAsRootWindowForTest(false);
// Kill the viewer process if we spun one up.
metro_viewer_host_.reset();
« no previous file with comments | « ash/ash.gyp ('k') | mojo/services/native_viewport/native_viewport_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698