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

Side by Side Diff: ash/display/root_window_transformers_unittest.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again Created 4 years, 3 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
« no previous file with comments | « ash/dip_unittest.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <memory> 7 #include <memory>
8 8
9 #include "ash/common/shelf/shelf.h"
10 #include "ash/common/shelf/shelf_widget.h" 9 #include "ash/common/shelf/shelf_widget.h"
11 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
12 #include "ash/display/display_util.h" 11 #include "ash/display/display_util.h"
13 #include "ash/host/root_window_transformer.h" 12 #include "ash/host/root_window_transformer.h"
14 #include "ash/magnifier/magnification_controller.h" 13 #include "ash/magnifier/magnification_controller.h"
15 #include "ash/screen_util.h" 14 #include "ash/screen_util.h"
16 #include "ash/shell.h" 15 #include "ash/shell.h"
17 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.h"
18 #include "ash/test/cursor_manager_test_api.h" 17 #include "ash/test/cursor_manager_test_api.h"
19 #include "ash/test/display_manager_test_api.h" 18 #include "ash/test/display_manager_test_api.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 // Y margin must be margin is (500 - 500/400 * 200) / 2 = 125. 426 // Y margin must be margin is (500 - 500/400 * 200) / 2 = 125.
428 EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString()); 427 EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString());
429 428
430 UpdateDisplay("200x400,500x500"); 429 UpdateDisplay("200x400,500x500");
431 // The aspect ratio is flipped, so X margin is now 125. 430 // The aspect ratio is flipped, so X margin is now 125.
432 transformer = CreateCurrentRootWindowTransformerForMirroring(); 431 transformer = CreateCurrentRootWindowTransformerForMirroring();
433 EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString()); 432 EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString());
434 } 433 }
435 434
436 } // namespace ash 435 } // namespace ash
OLDNEW
« no previous file with comments | « ash/dip_unittest.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698