chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc - Issue 2741273002: chromeos: Promotes more from WmShell to Shell

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 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)

Patch Set: feedback Created 3 years, 9 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/launcher_context_menu.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 9ba0898a33bd19678c58334abbe79691700d4ca4..e4ba98e7912d1c57ca046912acb3cc5108efa924 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

@@ -2,8 +2,10 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"

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

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

+#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/test_shell_delegate.h"

#include "base/macros.h"

@@ -11,7 +13,6 @@

#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

-#include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile_manager.h"

@@ -44,7 +45,7 @@ class MultiUserNotificationBlockerChromeOSTest

ash::test::TestShellDelegate* shell_delegate =

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

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

+ ash::Shell::Get()->shell_delegate());

shell_delegate->set_multi_profiles_enabled(true);

chrome::MultiUserWindowManager::CreateInstance();