Chromium Code Reviews| 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 def0e0bb76421b2c95362dc14faff2c0642f8f8d..0ff98fd000c79fcbb48f2c4e1724662863bd24a0 100644 |
| --- a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc |
| +++ b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc |
| @@ -9,6 +9,7 @@ |
| #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" |
| namespace extensions { |
| @@ -40,11 +41,9 @@ FeedbackServiceImpl::~FeedbackServiceImpl() { |
| } |
| std::string FeedbackServiceImpl::GetUserEmail() { |
| - chromeos::UserManager* manager = chromeos::UserManager::Get(); |
| - if (!manager) |
| - return std::string(); |
| - else |
| - return manager->GetLoggedInUser()->display_email(); |
| + const chromeos::UserManager* manager = chromeos::UserManager::Get(); |
| + const user_manager::User* user = manager ? manager->GetLoggedInUser() : NULL; |
|
Daniel Erat
2014/08/01 20:38:19
should i also change this to call GetActiveUser()
|
| + return user ? user->display_email() : std::string(); |
| } |
| void FeedbackServiceImpl::GetHistograms(std::string* histograms) { |