chrome/browser/ui/views/frame/browser_frame.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/views/frame/browser_frame.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/session_util.cc ('k') | chrome/browser/ui/views/frame/system_menu_model_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_frame.cc

diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc

index 234a7d1e5d940a5ea3207242112e937c94fb7ac6..d1c767c688ff48a42b58792dd2922f17db57f6a5 100644

--- a/chrome/browser/ui/views/frame/browser_frame.cc

+++ b/chrome/browser/ui/views/frame/browser_frame.cc

@@ -33,7 +33,7 @@

#if defined(OS_CHROMEOS)

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

-#include "ash/shell.h"

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

#include "ui/native_theme/native_theme_dark_aura.h"

#endif

@@ -255,7 +255,7 @@ void BrowserFrame::ShowContextMenuForView(views::View* source,

ui::MenuModel* BrowserFrame::GetSystemMenuModel() {

#if defined(OS_CHROMEOS)

ash::SessionStateDelegate* delegate =

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

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

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

// In Multi user mode, the number of users as well as the order of users

// can change. Coming here we have more then one user and since the menu