ash/frame/custom_frame_view_ash_unittest.cc - Issue 2111443002: mash: Migrate SessionStateDelegate 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/frame/custom_frame_view_ash_unittest.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. 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 | « ash/desktop_background/desktop_background_view.cc ('k') | ash/mus/workspace/workspace_layout_manager_unittest.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/frame/custom_frame_view_ash_unittest.cc

diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc

index 13b4b4726805b41abb0b824200d3205d9b9b55bc..64dd219bf22c2056ab5d36bf948a15be0a675c43 100644

--- a/ash/frame/custom_frame_view_ash_unittest.cc

+++ b/ash/frame/custom_frame_view_ash_unittest.cc

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

#include <memory>

#include "ash/common/ash_layout_constants.h"

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

#include "ash/frame/caption_buttons/frame_caption_button.h"

#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

#include "ash/shell.h"

@@ -109,8 +110,8 @@ class CustomFrameViewAshTest : public test::AshTestBase {

}

test::TestSessionStateDelegate* GetTestSessionStateDelegate() {

- return static_cast<ash::test::TestSessionStateDelegate*>(

- Shell::GetInstance()->session_state_delegate());

+ return static_cast<test::TestSessionStateDelegate*>(

+ WmShell::Get()->GetSessionStateDelegate());

}

private: