chrome/browser/chromeos/drive/job_scheduler.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/drive/job_scheduler.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/chrome_browser_main_chromeos.cc ('K') | « chrome/browser/chromeos/drive/job_scheduler.h ('k') | chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc » ('j') | chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/drive/job_scheduler.cc

diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc

index fecb0f976e4aa7b5ba14517dc8a9eaaebd30a240..eeac6e40dc257e74235a6245e09ab1a7965fdf11 100644

--- a/chrome/browser/chromeos/drive/job_scheduler.cc

+++ b/chrome/browser/chromeos/drive/job_scheduler.cc

@@ -15,6 +15,7 @@

#include "base/thread_task_runner_handle.h"

#include "chrome/browser/drive/event_logger.h"

#include "chrome/common/pref_names.h"

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

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

#include "google_apis/drive/drive_api_parser.h"

@@ -702,7 +703,7 @@ void JobScheduler::UploadExistingFile(

void JobScheduler::AddPermission(

const std::string& resource_id,

- const std::string& email,

+ const user_manager::UserID& user_id,

google_apis::drive::PermissionRole role,

const google_apis::EntryActionCallback& callback) {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

@@ -712,7 +713,7 @@ void JobScheduler::AddPermission(

new_job->task = base::Bind(&DriveServiceInterface::AddPermission,

base::Unretained(drive_service_),

resource_id,

- email,

+ user_id,

role,

base::Bind(&JobScheduler::OnEntryActionJobDone,

weak_ptr_factory_.GetWeakPtr(),