Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Side by Side Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

Issue 379803004: Move UserInfo to user_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
OLDNEW
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 "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h" 8 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h"
9 9
10 #if defined(OS_CHROMEOS) 10 #if defined(OS_CHROMEOS)
11 #include "ash/ash_switches.h" 11 #include "ash/ash_switches.h"
12 #include "ash/multi_profile_uma.h" 12 #include "ash/multi_profile_uma.h"
13 #include "ash/session/session_state_delegate.h" 13 #include "ash/session/session_state_delegate.h"
14 #include "ash/session/user_info.h"
15 #include "ash/shell.h" 14 #include "ash/shell.h"
16 #include "ash/shell_delegate.h" 15 #include "ash/shell_delegate.h"
17 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" 16 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
17 #include "components/user_manager/user_info.h"
18 #endif 18 #endif
19 19
20 namespace { 20 namespace {
21 chrome::MultiUserWindowManager* g_instance = NULL; 21 chrome::MultiUserWindowManager* g_instance = NULL;
22 } // namespace 22 } // namespace
23 23
24 namespace chrome { 24 namespace chrome {
25 25
26 // Caching the current multi profile mode to avoid expensive detection 26 // Caching the current multi profile mode to avoid expensive detection
27 // operations. 27 // operations.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 void MultiUserWindowManager::SetInstanceForTest( 94 void MultiUserWindowManager::SetInstanceForTest(
95 MultiUserWindowManager* instance, 95 MultiUserWindowManager* instance,
96 MultiProfileMode mode) { 96 MultiProfileMode mode) {
97 if (g_instance) 97 if (g_instance)
98 DeleteInstance(); 98 DeleteInstance();
99 g_instance = instance; 99 g_instance = instance;
100 multi_user_mode_ = mode; 100 multi_user_mode_ = mode;
101 } 101 }
102 102
103 } // namespace chrome 103 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698