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

Unified Diff: ash/test/mirror_window_test_api.cc

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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: ash/test/mirror_window_test_api.cc
diff --git a/ash/test/mirror_window_test_api.cc b/ash/test/mirror_window_test_api.cc
index 701b27ea9af117b8f9da0b901ed8a5665b92feab..4af1fe7ca9d39707bdc4bcfff8dca27e3ae440ee 100644
--- a/ash/test/mirror_window_test_api.cc
+++ b/ash/test/mirror_window_test_api.cc
@@ -7,8 +7,9 @@
#include "ash/display/cursor_window_controller.h"
#include "ash/display/display_controller.h"
#include "ash/display/mirror_window_controller.h"
+#include "ash/host/ash_window_tree_host.h"
+#include "ash/host/root_window_transformer.h"
#include "ash/shell.h"
-#include "ui/aura/root_window_transformer.h"
#include "ui/gfx/point.h"
namespace ash {
@@ -16,7 +17,7 @@ namespace test {
const aura::WindowTreeHost* MirrorWindowTestApi::GetHost() const {
return Shell::GetInstance()->display_controller()->
- mirror_window_controller()->host_.get();
+ mirror_window_controller()->ash_host()->AsWindowTreeHost();
}
int MirrorWindowTestApi::GetCurrentCursorType() const {
@@ -34,7 +35,7 @@ const aura::Window* MirrorWindowTestApi::GetCursorWindow() const {
cursor_window_controller()->cursor_window_.get();
}
-scoped_ptr<aura::RootWindowTransformer>
+scoped_ptr<RootWindowTransformer>
MirrorWindowTestApi::CreateCurrentRootWindowTransformer() const {
return Shell::GetInstance()->display_controller()->
mirror_window_controller()->CreateRootWindowTransformer();

Powered by Google App Engine
This is Rietveld 408576698