chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_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: chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_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: Address comments. 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager.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_notification_blocker_chromeos_unittest.cc

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

index 59abfaf424c816b96b97f0c9bbe7f897e3ee09ef..5be0b064b52342d926b910fdc38752b618ad0775 100644

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

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

@@ -3,7 +3,7 @@

// found in the LICENSE file.

#include "ash/common/system/system_notifier.h"

-#include "ash/shell.h"

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

#include "ash/test/ash_test_base.h"

#include "ash/test/ash_test_helper.h"

#include "ash/test/test_session_state_delegate.h"

@@ -43,7 +43,7 @@ class MultiUserNotificationBlockerChromeOSTest

ash::test::TestShellDelegate* shell_delegate =

static_cast<ash::test::TestShellDelegate*>(

- ash::Shell::GetInstance()->delegate());

+ ash::WmShell::Get()->delegate());

shell_delegate->set_multi_profiles_enabled(true);

chrome::MultiUserWindowManager::CreateInstance();