chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc - Issue 2126963002: mash: Move multi_profile_uma.* to ash/common.

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/multi_user/multi_user_window_manager.cc

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

Patch Set: Sync and rebase. Created 4 years, 5 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

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/multi_user/multi_user_window_manager.h"	5 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

6	6

7 #include "ash/common/ash_switches.h"	7 #include "ash/common/ash_switches.h"

	8 #include "ash/common/multi_profile_uma.h"

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

9 #include "ash/common/shell_delegate.h"	10 #include "ash/common/shell_delegate.h"

10 #include "ash/common/wm_shell.h"	11 #include "ash/common/wm_shell.h"

11 #include "ash/multi_profile_uma.h"

12 #include "base/logging.h"	12 #include "base/logging.h"

13 #include "build/build_config.h"	13 #include "build/build_config.h"

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

15 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h"	15 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h"

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

17 #include "components/user_manager/user_info.h"	17 #include "components/user_manager/user_info.h"

18	18

19 namespace {	19 namespace {

20 chrome::MultiUserWindowManager* g_instance = NULL;	20 chrome::MultiUserWindowManager* g_instance = NULL;

21 } // namespace	21 } // namespace

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 void MultiUserWindowManager::SetInstanceForTest(	95 void MultiUserWindowManager::SetInstanceForTest(

96 MultiUserWindowManager* instance,	96 MultiUserWindowManager* instance,

97 MultiProfileMode mode) {	97 MultiProfileMode mode) {

98 if (g_instance)	98 if (g_instance)

99 DeleteInstance();	99 DeleteInstance();

100 g_instance = instance;	100 g_instance = instance;

101 multi_user_mode_ = mode;	101 multi_user_mode_ = mode;

102 }	102 }

103	103

104 } // namespace chrome	104 } // namespace chrome

OLD	NEW