Exclude UserManager[View] and ProfileHelper from Chrome OS
This code is not used on Chrome OS, and shouldn't be built.
Guard use in cross-platform files with preprocessor checks.
Bug: 647005
Test: Builders pass, no user management flows broken.
Change-Id: I2a82ba1b077504b9351233b29adfe5128c52a4d6
Reviewed-on: https://chromium-review.googlesource.com/907369
Commit-Queue: Michael Wasserman <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Cr-Commit-Position: refs/heads/master@{#535458}diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 8d7bfc8..82ed106 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -145,7 +145,6 @@
#if !defined(OS_ANDROID)
#include "chrome/browser/gcm/gcm_product_util.h"
-#include "chrome/browser/ui/user_manager.h"
#include "components/gcm_driver/gcm_client_factory.h"
#include "components/gcm_driver/gcm_desktop_utils.h"
#include "components/keep_alive_registry/keep_alive_registry.h"
@@ -178,6 +177,7 @@
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
#include "chrome/browser/first_run/upgrade_util.h"
+#include "chrome/browser/ui/user_manager.h"
#endif
#if defined(OS_ANDROID)
@@ -322,9 +322,7 @@
tearing_down_ = true;
DCHECK(IsShuttingDown());
-#if !defined(OS_ANDROID)
KeepAliveRegistry::GetInstance()->SetIsShuttingDown();
-#endif // !defined(OS_ANDROID)
// We need to destroy the MetricsServicesManager, IntranetRedirectDetector,
// NetworkTimeTracker, and SafeBrowsing ClientSideDetectionService
@@ -358,9 +356,11 @@
{
TRACE_EVENT0("shutdown",
"BrowserProcessImpl::StartTearDown:ProfileManager");
+#if !defined(OS_CHROMEOS)
// The desktop User Manager needs to be closed before the guest profile
// can be destroyed.
UserManager::Hide();
+#endif // !defined(OS_CHROMEOS)
profile_manager_.reset();
}
