chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_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/launcher/chrome_launcher_controller_impl_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/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

index b2a3a76ac6ba11bc6a75a1dc3078276dc550e7b4..95f95747510a0297c806d7b0399e5d81ea899937 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

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

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

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

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

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

#include "ash/shell.h"

#include "ash/test/ash_test_helper.h"

#include "ash/test/shelf_item_delegate_manager_test_api.h"

@@ -1038,7 +1039,7 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerImplTest

ash::test::AshTestHelper::GetTestSessionStateDelegate()

->set_logged_in_users(2);

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

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

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

shell_delegate_->set_multi_profiles_enabled(true);

}