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

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

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: fix windows build Created 4 years, 1 month 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/display/screen_ash.cc ('k') | ash/display/screen_orientation_controller_chromeos.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/display_manager.h"
6 #include "ash/shell.h" 5 #include "ash/shell.h"
7 #include "ash/test/ash_test_base.h" 6 #include "ash/test/ash_test_base.h"
8 #include "ui/aura/test/test_window_delegate.h" 7 #include "ui/aura/test/test_window_delegate.h"
9 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/display/manager/display_manager.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 class ScreenAshTest : public test::AshTestBase { 13 class ScreenAshTest : public test::AshTestBase {
14 public: 14 public:
15 ScreenAshTest() {} 15 ScreenAshTest() {}
16 ~ScreenAshTest() override {} 16 ~ScreenAshTest() override {}
17 17
18 private: 18 private:
19 DISALLOW_COPY_AND_ASSIGN(ScreenAshTest); 19 DISALLOW_COPY_AND_ASSIGN(ScreenAshTest);
(...skipping 16 matching lines...) Expand all
36 36
37 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow()); 37 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow());
38 38
39 EXPECT_EQ(win1.get(), display::Screen::GetScreen()->GetWindowAtScreenPoint( 39 EXPECT_EQ(win1.get(), display::Screen::GetScreen()->GetWindowAtScreenPoint(
40 gfx::Point(50, 60))); 40 gfx::Point(50, 60)));
41 EXPECT_EQ(win2.get(), display::Screen::GetScreen()->GetWindowAtScreenPoint( 41 EXPECT_EQ(win2.get(), display::Screen::GetScreen()->GetWindowAtScreenPoint(
42 gfx::Point(250, 260))); 42 gfx::Point(250, 260)));
43 } 43 }
44 44
45 } // namespace ash 45 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/screen_ash.cc ('k') | ash/display/screen_orientation_controller_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698