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

Unified Diff: ash/display/root_window_transformers_unittest.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/display/root_window_transformers_unittest.cc
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc
index 954deb8d7ba24743942296204888675ce1320ddb..58eea7920fa3b43d3e560f9dad707c70cded6a8e 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -7,6 +7,7 @@
#include "ash/display/display_info.h"
#include "ash/display/display_manager.h"
#include "ash/magnifier/magnification_controller.h"
+#include "ash/host/root_window_transformer.h"
#include "ash/screen_util.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_widget.h"
@@ -16,7 +17,6 @@
#include "ash/test/mirror_window_test_api.h"
#include "base/synchronization/waitable_event.h"
#include "ui/aura/env.h"
-#include "ui/aura/root_window_transformer.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tracker.h"
@@ -399,7 +399,7 @@ TEST_F(RootWindowTransformersTest, LetterBoxPillarBox) {
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
display_manager->SetSecondDisplayMode(DisplayManager::MIRRORING);
UpdateDisplay("400x200,500x500");
- scoped_ptr<aura::RootWindowTransformer> transformer(
+ scoped_ptr<RootWindowTransformer> transformer(
test_api.CreateCurrentRootWindowTransformer());
// Y margin must be margin is (500 - 500/400 * 200) / 2 = 125.
EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString());

Powered by Google App Engine
This is Rietveld 408576698