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

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: rebase Created 6 years, 8 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/test/mirror_window_test_api.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4941038b8027787eefc5b35b0f829143378c8862 100644
--- a/ash/test/mirror_window_test_api.cc
+++ b/ash/test/mirror_window_test_api.cc
@@ -7,16 +7,19 @@
#include "ash/display/cursor_window_controller.h"
#include "ash/display/display_controller.h"
#include "ash/display/mirror_window_controller.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 {
namespace test {
const aura::WindowTreeHost* MirrorWindowTestApi::GetHost() const {
- return Shell::GetInstance()->display_controller()->
- mirror_window_controller()->host_.get();
+ aura::Window* window = Shell::GetInstance()
+ ->display_controller()
+ ->mirror_window_controller()
+ ->GetWindow();
+ return window ? window->GetHost() : NULL;
}
int MirrorWindowTestApi::GetCurrentCursorType() const {
@@ -34,7 +37,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();
« no previous file with comments | « ash/test/mirror_window_test_api.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698