chrome/browser/chromeos/file_system_provider/mount_path_util.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/file_system_provider/mount_path_util.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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:

Index: chrome/browser/chromeos/file_system_provider/mount_path_util.cc

diff --git a/chrome/browser/chromeos/file_system_provider/mount_path_util.cc b/chrome/browser/chromeos/file_system_provider/mount_path_util.cc

index 3f20f3a362c35596d9cff348377fb005f15d210f..0456a7e7423ac410be25e4066cd675c70723f0c6 100644

--- a/chrome/browser/chromeos/file_system_provider/mount_path_util.cc

+++ b/chrome/browser/chromeos/file_system_provider/mount_path_util.cc

@@ -11,11 +11,11 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/file_system_provider/provided_file_system.h"

#include "chrome/browser/chromeos/file_system_provider/service.h"

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

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

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

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

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

using content::BrowserThread;

@@ -50,7 +50,7 @@ std::string EscapeFileSystemId(const std::string& file_system_id) {

base::FilePath GetMountPath(Profile* profile,

const std::string& extension_id,

const std::string& file_system_id) {

- chromeos::User* const user =

+ user_manager::User* const user =

chromeos::UserManager::IsInitialized()

? chromeos::ProfileHelper::Get()->GetUserByProfile(

profile->GetOriginalProfile())