chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc - Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)

Patch Set: feedback Created 3 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

index 844ad12aa866d153671fa4a2020f224b7853aea2..aa7d11f77ccf03f108bb0e3afdeb224b9653102d 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

@@ -4,7 +4,6 @@

#include <stddef.h>

-#include "ash/aura/wm_window_aura.h"

#include "ash/common/shelf/shelf_widget.h"

#include "ash/common/shelf/wm_shelf.h"

#include "ash/common/test/test_session_state_delegate.h"

@@ -14,6 +13,7 @@

#include "ash/common/wm/window_state.h"

#include "ash/common/wm/wm_event.h"

#include "ash/common/wm_shell.h"

+#include "ash/common/wm_window.h"

#include "ash/content/shell_content_state.h"

#include "ash/public/cpp/shell_window_ids.h"

#include "ash/shell.h"

@@ -114,7 +114,7 @@ class TestShellDelegateChromeOS : public ash::test::TestShellDelegate {

bool CanShowWindowForUser(ash::WmWindow* window) const override {

return ::CanShowWindowForUser(

- ash::WmWindowAura::GetAuraWindow(window),

+ ash::WmWindow::GetAuraWindow(window),

base::Bind(&ash::ShellContentState::GetActiveBrowserContext,

base::Unretained(ash::ShellContentState::GetInstance())));

}

@@ -1505,7 +1505,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {

activation_client->ActivateWindow(window(0));

EXPECT_EQ(wm::GetActiveWindow(), window(0));

- aura::Window::Windows mru_list = WmWindowAura::ToAuraWindows(

+ aura::Window::Windows mru_list = WmWindow::ToAuraWindows(

WmShell::Get()->mru_window_tracker()->BuildMruWindowList());

EXPECT_EQ(mru_list[0], window(0));

EXPECT_EQ(mru_list[1], window(1));

@@ -1521,7 +1521,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {

EXPECT_EQ("S[A], S[A], S[A]", GetStatus());

EXPECT_EQ(wm::GetActiveWindow(), window(0));

- mru_list = WmWindowAura::ToAuraWindows(

+ mru_list = WmWindow::ToAuraWindows(

WmShell::Get()->mru_window_tracker()->BuildMruWindowList());

EXPECT_EQ(mru_list[0], window(0));

EXPECT_EQ(mru_list[1], window(1));