chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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

« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc ('k') | chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

index 5eb1590a48e41a83d4ab2e28fc46028c7e75b221..e7a14dc99228fe3300fb61173e06eb5f9892f515 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

@@ -16,7 +16,6 @@

#include "base/time/time.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/login_utils.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

@@ -33,6 +32,7 @@

#include "components/policy/core/common/cloud/cloud_external_data_manager.h"

#include "components/policy/core/common/cloud/device_management_service.h"

#include "components/user_manager/user.h"

+#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

#include "content/public/browser/browser_thread.h"

#include "net/url_request/url_request_context_getter.h"

@@ -150,10 +150,11 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

command_line->HasSwitch(chromeos::switches::kLoginUser);

const bool wait_for_initial_policy =

!is_browser_restart &&

- (chromeos::UserManager::Get()->IsCurrentUserNew() || is_affiliated_user);

+ (user_manager::UserManager::Get()->IsCurrentUserNew() ||

+ is_affiliated_user);

const base::TimeDelta initial_policy_fetch_timeout =

- chromeos::UserManager::Get()->IsCurrentUserNew()

+ user_manager::UserManager::Get()->IsCurrentUserNew()

? base::TimeDelta::Max()

: base::TimeDelta::FromSeconds(kInitialPolicyFetchTimeoutSeconds);