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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 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
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" 5 #include "ash/display/display_manager.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ui/aura/test/test_window_delegate.h" 8 #include "ui/aura/test/test_window_delegate.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 10
(...skipping 10 matching lines...) Expand all
21 21
22 // Tests that ScreenAsh::GetWindowAtScreenPoint() returns the correct window on 22 // Tests that ScreenAsh::GetWindowAtScreenPoint() returns the correct window on
23 // the correct display. 23 // the correct display.
24 TEST_F(ScreenAshTest, TestGetWindowAtScreenPoint) { 24 TEST_F(ScreenAshTest, TestGetWindowAtScreenPoint) {
25 if (!SupportsMultipleDisplays()) 25 if (!SupportsMultipleDisplays())
26 return; 26 return;
27 27
28 UpdateDisplay("200x200,400x400"); 28 UpdateDisplay("200x200,400x400");
29 29
30 aura::test::TestWindowDelegate delegate; 30 aura::test::TestWindowDelegate delegate;
31 scoped_ptr<aura::Window> win1(CreateTestWindowInShellWithDelegate( 31 std::unique_ptr<aura::Window> win1(CreateTestWindowInShellWithDelegate(
32 &delegate, 0, gfx::Rect(0, 0, 200, 200))); 32 &delegate, 0, gfx::Rect(0, 0, 200, 200)));
33 33
34 scoped_ptr<aura::Window> win2(CreateTestWindowInShellWithDelegate( 34 std::unique_ptr<aura::Window> win2(CreateTestWindowInShellWithDelegate(
35 &delegate, 1, gfx::Rect(200, 200, 100, 100))); 35 &delegate, 1, gfx::Rect(200, 200, 100, 100)));
36 36
37 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow()); 37 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow());
38 38
39 EXPECT_EQ(win1.get(), gfx::Screen::GetScreen()->GetWindowAtScreenPoint( 39 EXPECT_EQ(win1.get(), gfx::Screen::GetScreen()->GetWindowAtScreenPoint(
40 gfx::Point(50, 60))); 40 gfx::Point(50, 60)));
41 EXPECT_EQ(win2.get(), gfx::Screen::GetScreen()->GetWindowAtScreenPoint( 41 EXPECT_EQ(win2.get(), gfx::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/root_window_transformers_unittest.cc ('k') | ash/display/screen_position_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698