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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

Issue 1960293003: Remove OS_CHROMEOS from ui/ash code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
index b2b51bee4de813145b64e11fd4e05b1016fa5c23..8cbffb22d7f9885ef0e4c39d018bcd340cc8ff26 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc
@@ -4,20 +4,17 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
-#include "base/logging.h"
-#include "build/build_config.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h"
-
-#if defined(OS_CHROMEOS)
#include "ash/ash_switches.h"
#include "ash/multi_profile_uma.h"
#include "ash/session/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
+#include "base/logging.h"
+#include "build/build_config.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/user_info.h"
-#endif
namespace {
chrome::MultiUserWindowManager* g_instance = NULL;
@@ -39,7 +36,6 @@ MultiUserWindowManager* MultiUserWindowManager::GetInstance() {
MultiUserWindowManager* MultiUserWindowManager::CreateInstance() {
DCHECK(!g_instance);
multi_user_mode_ = MULTI_PROFILE_MODE_OFF;
-#if defined(OS_CHROMEOS)
ash::MultiProfileUMA::SessionMode mode =
ash::MultiProfileUMA::SESSION_SINGLE_USER_MODE;
if (!g_instance &&
@@ -60,7 +56,7 @@ MultiUserWindowManager* MultiUserWindowManager::CreateInstance() {
mode = ash::MultiProfileUMA::SESSION_SIDE_BY_SIDE_MODE;
}
ash::MultiProfileUMA::RecordSessionMode(mode);
-#endif
+
// If there was no instance created yet we create a dummy instance.
if (!g_instance)
g_instance = new MultiUserWindowManagerStub();
« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_util.cc ('k') | chrome/browser/ui/ash/session_state_delegate_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698