OLD | NEW |
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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "ash/content/shell_content_state.h" | 7 #include "ash/content/shell_content_state.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/shelf/shelf_widget.h" | 9 #include "ash/shelf/shelf_widget.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 std::vector<aura::Window*> window_; | 257 std::vector<aura::Window*> window_; |
258 | 258 |
259 // The instance of the MultiUserWindowManager. | 259 // The instance of the MultiUserWindowManager. |
260 chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_; | 260 chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_; |
261 | 261 |
262 // The session state delegate. | 262 // The session state delegate. |
263 TestSessionStateDelegate* session_state_delegate_; | 263 TestSessionStateDelegate* session_state_delegate_; |
264 | 264 |
265 chromeos::FakeChromeUserManager* fake_user_manager_; // Not owned. | 265 chromeos::FakeChromeUserManager* fake_user_manager_; // Not owned. |
266 | 266 |
267 scoped_ptr<TestingProfileManager> profile_manager_; | 267 std::unique_ptr<TestingProfileManager> profile_manager_; |
268 | 268 |
269 chromeos::ScopedUserManagerEnabler user_manager_enabler_; | 269 chromeos::ScopedUserManagerEnabler user_manager_enabler_; |
270 | 270 |
271 // The maximized window manager (if enabled). | 271 // The maximized window manager (if enabled). |
272 scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_; | 272 std::unique_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_; |
273 | 273 |
274 DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerChromeOSTest); | 274 DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerChromeOSTest); |
275 }; | 275 }; |
276 | 276 |
277 void MultiUserWindowManagerChromeOSTest::SetUp() { | 277 void MultiUserWindowManagerChromeOSTest::SetUp() { |
278 ash_test_helper()->set_test_shell_delegate(new TestShellDelegateChromeOS); | 278 ash_test_helper()->set_test_shell_delegate(new TestShellDelegateChromeOS); |
279 ash_test_helper()->set_content_state(new ::TestShellContentState); | 279 ash_test_helper()->set_content_state(new ::TestShellContentState); |
280 AshTestBase::SetUp(); | 280 AshTestBase::SetUp(); |
281 session_state_delegate_ = static_cast<TestSessionStateDelegate*>( | 281 session_state_delegate_ = static_cast<TestSessionStateDelegate*>( |
282 ash::Shell::GetInstance()->session_state_delegate()); | 282 ash::Shell::GetInstance()->session_state_delegate()); |
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1524 | 1524 |
1525 mru_list = | 1525 mru_list = |
1526 ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList(); | 1526 ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList(); |
1527 EXPECT_EQ(mru_list[0], window(0)); | 1527 EXPECT_EQ(mru_list[0], window(0)); |
1528 EXPECT_EQ(mru_list[1], window(1)); | 1528 EXPECT_EQ(mru_list[1], window(1)); |
1529 EXPECT_EQ(mru_list[2], window(2)); | 1529 EXPECT_EQ(mru_list[2], window(2)); |
1530 } | 1530 } |
1531 | 1531 |
1532 } // namespace test | 1532 } // namespace test |
1533 } // namespace ash | 1533 } // namespace ash |
OLD | NEW |