chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc - Issue 2115663002: Folds methods in WmShellCommon to WmShell

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 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 6 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/chrome_shell_delegate.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 7a443186ae53a427d8ad8a8270990be25f7bb3b2..19f94f65eac4a0eff40011095aa6c21f92c2eecc 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

@@ -10,6 +10,7 @@

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

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

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

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

#include "ash/content/shell_content_state.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_widget.h"

@@ -1497,7 +1498,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {

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

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

- Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());

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

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

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

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

@@ -1513,7 +1514,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {