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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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
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 "ash/common/multi_profile_uma.h" 7 #include "ash/multi_profile_uma.h"
8 #include "ash/common/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/wm_shell.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" 12 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
13 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h" 13 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h"
14 #include "components/signin/core/account_id/account_id.h" 14 #include "components/signin/core/account_id/account_id.h"
15 #include "components/user_manager/user_info.h" 15 #include "components/user_manager/user_info.h"
16 #include "components/user_manager/user_manager.h" 16 #include "components/user_manager/user_manager.h"
17 17
18 namespace { 18 namespace {
19 chrome::MultiUserWindowManager* g_instance = NULL; 19 chrome::MultiUserWindowManager* g_instance = NULL;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void MultiUserWindowManager::SetInstanceForTest( 93 void MultiUserWindowManager::SetInstanceForTest(
94 MultiUserWindowManager* instance, 94 MultiUserWindowManager* instance,
95 MultiProfileMode mode) { 95 MultiProfileMode mode) {
96 if (g_instance) 96 if (g_instance)
97 DeleteInstance(); 97 DeleteInstance();
98 g_instance = instance; 98 g_instance = instance;
99 multi_user_mode_ = mode; 99 multi_user_mode_ = mode;
100 } 100 }
101 101
102 } // namespace chrome 102 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698