chrome/browser/ui/ash/session_util.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: chrome/browser/ui/ash/session_util.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

« chrome/browser/ui/ash/network_connect_delegate_chromeos.cc ('K') | « chrome/browser/ui/ash/network_connect_delegate_chromeos.cc ('k') | chrome/browser/ui/views/frame/browser_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/session_util.cc

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

index 61996f6acbaec27b8a256d624aef302be1526dc3..0a22ba61259a4e8502a767f3b9768be0a874bd75 100644

--- a/chrome/browser/ui/ash/session_util.cc

+++ b/chrome/browser/ui/ash/session_util.cc

@@ -5,8 +5,8 @@

#include "chrome/browser/ui/ash/session_util.h"

#include "ash/common/session/session_state_delegate.h"

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

#include "ash/content/shell_content_state.h"

-#include "ash/shell.h"

#include "build/build_config.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/profiles/profile.h"

@@ -27,7 +27,7 @@ bool CanShowWindowForUser(

aura::Window* window,

const GetActiveBrowserContextCallback& get_context_callback) {

ash::SessionStateDelegate* delegate =

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

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

if (delegate->NumberOfLoggedInUsers() > 1) {

content::BrowserContext* active_browser_context =

get_context_callback.Run();