chrome/browser/memory/tab_manager.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/memory/tab_manager.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

« no previous file with comments | « chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc ('k') | chrome/browser/ui/ash/chrome_shell_content_state_chromeos.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/memory/tab_manager.cc

diff --git a/chrome/browser/memory/tab_manager.cc b/chrome/browser/memory/tab_manager.cc

index 90e8df34a46b5b58e8429535b2048d30a3e5547d..e7d7d39e62ceea7ba8e908cce78179705dcf93c8 100644

--- a/chrome/browser/memory/tab_manager.cc

+++ b/chrome/browser/memory/tab_manager.cc

@@ -54,8 +54,8 @@

#if defined(OS_CHROMEOS)

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

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

#include "ash/multi_profile_uma.h"

-#include "ash/shell.h"

#include "chrome/browser/memory/tab_manager_delegate_chromeos.h"

#endif

@@ -384,9 +384,9 @@ void TabManager::RecordDiscardStatistics() {

#if defined(OS_CHROMEOS)

// Record the discarded tab in relation to the amount of simultaneously

// logged in users.

- if (ash::Shell::HasInstance()) {

- ash::MultiProfileUMA::RecordDiscardedTab(ash::Shell::GetInstance()

- ->session_state_delegate()

+ if (ash::WmShell::HasInstance()) {

+ ash::MultiProfileUMA::RecordDiscardedTab(ash::WmShell::Get()

+ ->GetSessionStateDelegate()

->NumberOfLoggedInUsers());

}

#endif