| 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 <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/content/shell_content_state.h" | 10 #include "ash/content/shell_content_state.h" |
| (...skipping 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1287 | 1287 |
| 1288 // Check that teleporting back will also change the desktop. | 1288 // Check that teleporting back will also change the desktop. |
| 1289 multi_user_window_manager()->ShowWindowForUser(window(2), account_id_c); | 1289 multi_user_window_manager()->ShowWindowForUser(window(2), account_id_c); |
| 1290 EXPECT_EQ(account_id_c, GetAndValidateCurrentUserFromSessionStateObserver()); | 1290 EXPECT_EQ(account_id_c, GetAndValidateCurrentUserFromSessionStateObserver()); |
| 1291 EXPECT_EQ("H[a,b], H[b], S[c]", GetStatus()); | 1291 EXPECT_EQ("H[a,b], H[b], S[c]", GetStatus()); |
| 1292 } | 1292 } |
| 1293 | 1293 |
| 1294 class TestWindowObserver : public aura::WindowObserver { | 1294 class TestWindowObserver : public aura::WindowObserver { |
| 1295 public: | 1295 public: |
| 1296 TestWindowObserver(): resize_calls_(0) {} | 1296 TestWindowObserver(): resize_calls_(0) {} |
| 1297 ~TestWindowObserver() override{}; | 1297 ~TestWindowObserver() override {} |
| 1298 | 1298 |
| 1299 void OnWindowBoundsChanged(aura::Window* window, | 1299 void OnWindowBoundsChanged(aura::Window* window, |
| 1300 const gfx::Rect& old_bounds, | 1300 const gfx::Rect& old_bounds, |
| 1301 const gfx::Rect& new_bounds) override { | 1301 const gfx::Rect& new_bounds) override { |
| 1302 resize_calls_++; | 1302 resize_calls_++; |
| 1303 } | 1303 } |
| 1304 | 1304 |
| 1305 int resize_calls() { return resize_calls_; } | 1305 int resize_calls() { return resize_calls_; } |
| 1306 | 1306 |
| 1307 private: | 1307 private: |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1605 user_manager()->SwitchActiveUser(account_id_B); | 1605 user_manager()->SwitchActiveUser(account_id_B); |
| 1606 multi_user_window_manager()->ActiveUserChanged( | 1606 multi_user_window_manager()->ActiveUserChanged( |
| 1607 user_manager()->FindUser(account_id_B)); | 1607 user_manager()->FindUser(account_id_B)); |
| 1608 EXPECT_EQ(browser.get(), BrowserList::GetInstance()->GetLastActive()); | 1608 EXPECT_EQ(browser.get(), BrowserList::GetInstance()->GetLastActive()); |
| 1609 EXPECT_EQ(nullptr, wm::GetActiveWindow()); | 1609 EXPECT_EQ(nullptr, wm::GetActiveWindow()); |
| 1610 EXPECT_EQ(nullptr, ChromeNewWindowClient::GetActiveBrowser()); | 1610 EXPECT_EQ(nullptr, ChromeNewWindowClient::GetActiveBrowser()); |
| 1611 } | 1611 } |
| 1612 | 1612 |
| 1613 } // namespace test | 1613 } // namespace test |
| 1614 } // namespace ash | 1614 } // namespace ash |
| OLD | NEW |