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

Unified Diff: chrome/browser/chromeos/file_manager/path_util.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: chrome/browser/chromeos/file_manager/path_util.cc
diff --git a/chrome/browser/chromeos/file_manager/path_util.cc b/chrome/browser/chromeos/file_manager/path_util.cc
index 8896bfe3b668540279e97108b33e2209088b33e9..cf9b0ed3937cce96e5ce9a25fc2a8cb32679fb02 100644
--- a/chrome/browser/chromeos/file_manager/path_util.cc
+++ b/chrome/browser/chromeos/file_manager/path_util.cc
@@ -8,11 +8,11 @@
#include "base/logging.h"
#include "base/sys_info.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
#include "net/base/escape.h"
namespace file_manager {
@@ -35,12 +35,12 @@ base::FilePath GetDownloadsFolderForProfile(Profile* profile) {
// On non-ChromeOS system (test+development), the primary profile uses
// $HOME/Downloads for ease for accessing local files for debugging.
if (!base::SysInfo::IsRunningOnChromeOS() &&
- chromeos::UserManager::IsInitialized()) {
+ user_manager::UserManager::IsInitialized()) {
const user_manager::User* const user =
chromeos::ProfileHelper::Get()->GetUserByProfile(
profile->GetOriginalProfile());
const user_manager::User* const primary_user =
- chromeos::UserManager::Get()->GetPrimaryUser();
+ user_manager::UserManager::Get()->GetPrimaryUser();
if (user == primary_user)
return DownloadPrefs::GetDefaultDownloadDirectory();
}
@@ -76,7 +76,7 @@ bool MigratePathFromOldFormat(Profile* profile,
// no-op when multi-profile is enabled. This is necessary for (1) back
// migration when multi-profile flag is enabled and then disabled, or (2) in
// some edge cases (crbug.com/356322) that u-<hash> path is temporarily used.
- if (chromeos::UserManager::IsInitialized()) {
+ if (user_manager::UserManager::IsInitialized()) {
const user_manager::User* const user =
chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
if (user) {
@@ -107,7 +107,7 @@ std::string GetDownloadsMountPointName(Profile* profile) {
// are not associated with an user account. In that case, no suffix is added
// because such a profile never belongs to a multi-profile session.
user_manager::User* const user =
- chromeos::UserManager::IsInitialized()
+ user_manager::UserManager::IsInitialized()
? chromeos::ProfileHelper::Get()->GetUserByProfile(
profile->GetOriginalProfile())
: NULL;

Powered by Google App Engine
This is Rietveld 408576698