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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/display/root_window_transformers.h" 5 #include "ash/display/root_window_transformers.h"
6 6
7 #include "ash/display/display_info.h" 7 #include "ash/display/display_info.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/host/root_window_transformer.h"
9 #include "ash/magnifier/magnification_controller.h" 10 #include "ash/magnifier/magnification_controller.h"
10 #include "ash/screen_util.h" 11 #include "ash/screen_util.h"
11 #include "ash/shelf/shelf.h" 12 #include "ash/shelf/shelf.h"
12 #include "ash/shelf/shelf_widget.h" 13 #include "ash/shelf/shelf_widget.h"
13 #include "ash/shell.h" 14 #include "ash/shell.h"
14 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
15 #include "ash/test/cursor_manager_test_api.h" 16 #include "ash/test/cursor_manager_test_api.h"
16 #include "ash/test/mirror_window_test_api.h" 17 #include "ash/test/mirror_window_test_api.h"
17 #include "base/synchronization/waitable_event.h" 18 #include "base/synchronization/waitable_event.h"
18 #include "ui/aura/env.h" 19 #include "ui/aura/env.h"
19 #include "ui/aura/root_window_transformer.h"
20 #include "ui/aura/test/event_generator.h" 20 #include "ui/aura/test/event_generator.h"
21 #include "ui/aura/window_event_dispatcher.h" 21 #include "ui/aura/window_event_dispatcher.h"
22 #include "ui/aura/window_tracker.h" 22 #include "ui/aura/window_tracker.h"
23 #include "ui/events/event_handler.h" 23 #include "ui/events/event_handler.h"
24 #include "ui/gfx/display.h" 24 #include "ui/gfx/display.h"
25 #include "ui/gfx/rect_conversions.h" 25 #include "ui/gfx/rect_conversions.h"
26 #include "ui/gfx/screen.h" 26 #include "ui/gfx/screen.h"
27 #include "ui/views/widget/widget.h" 27 #include "ui/views/widget/widget.h"
28 28
29 namespace ash { 29 namespace ash {
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 Shell::GetInstance()->RemovePreTargetHandler(&event_handler); 390 Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
391 } 391 }
392 392
393 TEST_F(RootWindowTransformersTest, LetterBoxPillarBox) { 393 TEST_F(RootWindowTransformersTest, LetterBoxPillarBox) {
394 if (!SupportsMultipleDisplays()) 394 if (!SupportsMultipleDisplays())
395 return; 395 return;
396 test::MirrorWindowTestApi test_api; 396 test::MirrorWindowTestApi test_api;
397 DisplayManager* display_manager = Shell::GetInstance()->display_manager(); 397 DisplayManager* display_manager = Shell::GetInstance()->display_manager();
398 display_manager->SetSecondDisplayMode(DisplayManager::MIRRORING); 398 display_manager->SetSecondDisplayMode(DisplayManager::MIRRORING);
399 UpdateDisplay("400x200,500x500"); 399 UpdateDisplay("400x200,500x500");
400 scoped_ptr<aura::RootWindowTransformer> transformer( 400 scoped_ptr<RootWindowTransformer> transformer(
401 test_api.CreateCurrentRootWindowTransformer()); 401 test_api.CreateCurrentRootWindowTransformer());
402 // Y margin must be margin is (500 - 500/400 * 200) / 2 = 125. 402 // Y margin must be margin is (500 - 500/400 * 200) / 2 = 125.
403 EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString()); 403 EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString());
404 404
405 UpdateDisplay("200x400,500x500"); 405 UpdateDisplay("200x400,500x500");
406 // The aspect ratio is flipped, so X margin is now 125. 406 // The aspect ratio is flipped, so X margin is now 125.
407 transformer = test_api.CreateCurrentRootWindowTransformer(); 407 transformer = test_api.CreateCurrentRootWindowTransformer();
408 EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString()); 408 EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString());
409 } 409 }
410 410
411 } // namespace ash 411 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/root_window_transformers.cc ('k') | ash/display/virtual_keyboard_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698