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

Unified Diff: chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc

Issue 438963004: Avoid a segfault in FeedbackServiceImpl::GetUserEmail(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/GetLoggedInUser/GetActiveUser/ 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 def0e0bb76421b2c95362dc14faff2c0642f8f8d..84bec474d70b331ba54accc5e1542f281848ad5f 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->GetActiveUser() : NULL;
+ return user ? user->display_email() : std::string();
}
void FeedbackServiceImpl::GetHistograms(std::string* histograms) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698