ash/wm/window_positioner_unittest.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access 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: ash/wm/window_positioner_unittest.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup. Created 4 years, 5 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

« ash/system/user/tray_user_unittest.cc ('K') | « ash/wm/lock_state_controller_unittest.cc ('k') | chrome/browser/chromeos/accessibility/magnification_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/window_positioner_unittest.cc

diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc

index 839607cfc8e140792e0be7b5d5d86ede3669521d..325022411b10e08ff6667ecd75cd020ca1d1d842 100644

--- a/ash/wm/window_positioner_unittest.cc

+++ b/ash/wm/window_positioner_unittest.cc

@@ -9,6 +9,7 @@

#include "ash/common/material_design/material_design_controller.h"

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

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

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

#include "ash/shell.h"

#include "ash/shell/toplevel_window.h"

#include "ash/test/ash_md_test_base.h"

@@ -174,7 +175,7 @@ TEST_P(WindowPositionerTest, FirstRunMaximizeWindowHighResloution) {

ui::WindowShowState show_state_out = ui::SHOW_STATE_DEFAULT;

test::TestShellDelegate* const delegate =

- static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());

+ static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());

delegate->SetForceMaximizeOnFirstRun(true);

WindowPositioner::GetBoundsAndShowStateForNewWindow(