chrome/browser/ui/ash/chrome_shell_content_state_chromeos.cc - Issue 2041233004: mash: Move //ash/session to //ash/common/session

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_content_state_chromeos.cc

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 unified diff | Download patch

« ash/mus/bridge/wm_shell_mus.cc ('K') | « chrome/browser/memory/tab_manager.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"	5 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"

6	6

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

8 #include "ash/shell.h"	8 #include "ash/shell.h"

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

10 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"	10 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

11 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"	11 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

12 #include "components/signin/core/account_id/account_id.h"	12 #include "components/signin/core/account_id/account_id.h"

13 #include "components/user_manager/user_manager.h"	13 #include "components/user_manager/user_manager.h"

14 #include "content/public/browser/browser_context.h"	14 #include "content/public/browser/browser_context.h"

15	15

16 content::BrowserContext* ChromeShellContentState::GetBrowserContextByIndex(	16 content::BrowserContext* ChromeShellContentState::GetBrowserContextByIndex(

17 ash::UserIndex index) {	17 ash::UserIndex index) {

(...skipping 18 matching lines...) Expand all Loading...
36 content::BrowserContext*	36 content::BrowserContext*

37 ChromeShellContentState::GetUserPresentingBrowserContextForWindow(	37 ChromeShellContentState::GetUserPresentingBrowserContextForWindow(

38 aura::Window* window) {	38 aura::Window* window) {

39 const AccountId& account_id =	39 const AccountId& account_id =

40 chrome::MultiUserWindowManager::GetInstance()->GetUserPresentingWindow(	40 chrome::MultiUserWindowManager::GetInstance()->GetUserPresentingWindow(

41 window);	41 window);

42 return account_id.is_valid()	42 return account_id.is_valid()

43 ? multi_user_util::GetProfileFromAccountId(account_id)	43 ? multi_user_util::GetProfileFromAccountId(account_id)

44 : nullptr;	44 : nullptr;

45 }	45 }

OLD	NEW