| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "ash/test/ash_test_base.h" | 6 #include "ash/test/ash_test_base.h" |
| 7 #include "ash/test/test_session_state_delegate.h" | 7 #include "ash/test/test_session_state_delegate.h" |
| 8 #include "ash/test/test_shell_delegate.h" | 8 #include "ash/test/test_shell_delegate.h" |
| 9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 ScopedUserManagerEnabler scoped_user_manager_; | 44 ScopedUserManagerEnabler scoped_user_manager_; |
| 45 | 45 |
| 46 DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiUnittest); | 46 DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiUnittest); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 class TestMinimizeFunction | 49 class TestMinimizeFunction |
| 50 : public WallpaperPrivateMinimizeInactiveWindowsFunction { | 50 : public WallpaperPrivateMinimizeInactiveWindowsFunction { |
| 51 public: | 51 public: |
| 52 TestMinimizeFunction() {} | 52 TestMinimizeFunction() {} |
| 53 | 53 |
| 54 virtual bool RunAsync() OVERRIDE { | 54 virtual bool RunAsync() override { |
| 55 return WallpaperPrivateMinimizeInactiveWindowsFunction::RunAsync(); | 55 return WallpaperPrivateMinimizeInactiveWindowsFunction::RunAsync(); |
| 56 } | 56 } |
| 57 | 57 |
| 58 protected: | 58 protected: |
| 59 virtual ~TestMinimizeFunction() {} | 59 virtual ~TestMinimizeFunction() {} |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 class TestRestoreFunction | 62 class TestRestoreFunction |
| 63 : public WallpaperPrivateRestoreMinimizedWindowsFunction { | 63 : public WallpaperPrivateRestoreMinimizedWindowsFunction { |
| 64 public: | 64 public: |
| 65 TestRestoreFunction() {} | 65 TestRestoreFunction() {} |
| 66 | 66 |
| 67 virtual bool RunAsync() OVERRIDE { | 67 virtual bool RunAsync() override { |
| 68 return WallpaperPrivateRestoreMinimizedWindowsFunction::RunAsync(); | 68 return WallpaperPrivateRestoreMinimizedWindowsFunction::RunAsync(); |
| 69 } | 69 } |
| 70 protected: | 70 protected: |
| 71 virtual ~TestRestoreFunction() {} | 71 virtual ~TestRestoreFunction() {} |
| 72 }; | 72 }; |
| 73 | 73 |
| 74 } // namespace | 74 } // namespace |
| 75 | 75 |
| 76 TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) { | 76 TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) { |
| 77 fake_user_manager()->AddUser(kTestAccount1); | 77 fake_user_manager()->AddUser(kTestAccount1); |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 EXPECT_FALSE(window1_state->IsMinimized()); | 179 EXPECT_FALSE(window1_state->IsMinimized()); |
| 180 } | 180 } |
| 181 | 181 |
| 182 class WallpaperPrivateApiMultiUserUnittest | 182 class WallpaperPrivateApiMultiUserUnittest |
| 183 : public WallpaperPrivateApiUnittest { | 183 : public WallpaperPrivateApiUnittest { |
| 184 public: | 184 public: |
| 185 WallpaperPrivateApiMultiUserUnittest() | 185 WallpaperPrivateApiMultiUserUnittest() |
| 186 : multi_user_window_manager_(NULL), | 186 : multi_user_window_manager_(NULL), |
| 187 session_state_delegate_(NULL) {} | 187 session_state_delegate_(NULL) {} |
| 188 | 188 |
| 189 virtual void SetUp() OVERRIDE; | 189 virtual void SetUp() override; |
| 190 virtual void TearDown() OVERRIDE; | 190 virtual void TearDown() override; |
| 191 | 191 |
| 192 protected: | 192 protected: |
| 193 void SetUpMultiUserWindowManager( | 193 void SetUpMultiUserWindowManager( |
| 194 const std::string& active_user_id, | 194 const std::string& active_user_id, |
| 195 chrome::MultiUserWindowManager::MultiProfileMode mode); | 195 chrome::MultiUserWindowManager::MultiProfileMode mode); |
| 196 | 196 |
| 197 void SwitchActiveUser(const std::string& active_user_id); | 197 void SwitchActiveUser(const std::string& active_user_id); |
| 198 | 198 |
| 199 chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager() { | 199 chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager() { |
| 200 return multi_user_window_manager_; | 200 return multi_user_window_manager_; |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 scoped_refptr<TestRestoreFunction> restore_function_1( | 395 scoped_refptr<TestRestoreFunction> restore_function_1( |
| 396 new TestRestoreFunction()); | 396 new TestRestoreFunction()); |
| 397 EXPECT_TRUE(restore_function_1->RunAsync()); | 397 EXPECT_TRUE(restore_function_1->RunAsync()); |
| 398 | 398 |
| 399 EXPECT_FALSE(window1_state->IsMinimized()); | 399 EXPECT_FALSE(window1_state->IsMinimized()); |
| 400 EXPECT_FALSE(window2_state->IsMinimized()); | 400 EXPECT_FALSE(window2_state->IsMinimized()); |
| 401 EXPECT_FALSE(window3_state->IsMinimized()); | 401 EXPECT_FALSE(window3_state->IsMinimized()); |
| 402 } | 402 } |
| 403 | 403 |
| 404 } // namespace chromeos | 404 } // namespace chromeos |
| OLD | NEW |