chrome/browser/extensions/api/feedback_private/feedback_service_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/extensions/api/feedback_private/feedback_service_chromeos.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

« no previous file with comments | « chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc ('k') | chrome/browser/extensions/api/identity/identity_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc

diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc

index 84bec474d70b331ba54accc5e1542f281848ad5f..94cd0e3e256b9bf2cb0147ccb800fb401adb62d4 100644

--- a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc

+++ b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc

@@ -8,8 +8,8 @@

#include "base/memory/weak_ptr.h"

#include "base/metrics/statistics_recorder.h"

#include "base/values.h"

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

#include "components/user_manager/user.h"

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

namespace extensions {

@@ -41,7 +41,7 @@ FeedbackServiceImpl::~FeedbackServiceImpl() {

}

std::string FeedbackServiceImpl::GetUserEmail() {

- const chromeos::UserManager* manager = chromeos::UserManager::Get();

+ const user_manager::UserManager* manager = user_manager::UserManager::Get();

const user_manager::User* user = manager ? manager->GetActiveUser() : NULL;

return user ? user->display_email() : std::string();

}