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

Side by Side Diff: chrome/browser/extensions/api/autotest_private/autotest_private_api.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/autotest_private/autotest_private_api.h" 5 #include "chrome/browser/extensions/api/autotest_private/autotest_private_api.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "chrome/browser/extensions/extension_action_manager.h" 9 #include "chrome/browser/extensions/extension_action_manager.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 result->SetBoolean("isLoggedIn", user_manager->IsUserLoggedIn()); 106 result->SetBoolean("isLoggedIn", user_manager->IsUserLoggedIn());
107 result->SetBoolean("isOwner", user_manager->IsCurrentUserOwner()); 107 result->SetBoolean("isOwner", user_manager->IsCurrentUserOwner());
108 result->SetBoolean("isScreenLocked", is_screen_locked); 108 result->SetBoolean("isScreenLocked", is_screen_locked);
109 if (user_manager->IsUserLoggedIn()) { 109 if (user_manager->IsUserLoggedIn()) {
110 result->SetBoolean("isRegularUser", 110 result->SetBoolean("isRegularUser",
111 user_manager->IsLoggedInAsUserWithGaiaAccount()); 111 user_manager->IsLoggedInAsUserWithGaiaAccount());
112 result->SetBoolean("isGuest", user_manager->IsLoggedInAsGuest()); 112 result->SetBoolean("isGuest", user_manager->IsLoggedInAsGuest());
113 result->SetBoolean("isKiosk", user_manager->IsLoggedInAsKioskApp()); 113 result->SetBoolean("isKiosk", user_manager->IsLoggedInAsKioskApp());
114 114
115 const user_manager::User* user = user_manager->GetLoggedInUser(); 115 const user_manager::User* user = user_manager->GetLoggedInUser();
116 result->SetString("email", user->email()); 116 result->SetString("email", user->GetUserID().GetUserEmail());
117 result->SetString("displayEmail", user->display_email()); 117 result->SetString("displayEmail", user->display_email());
118 118
119 std::string user_image; 119 std::string user_image;
120 switch (user->image_index()) { 120 switch (user->image_index()) {
121 case user_manager::User::USER_IMAGE_EXTERNAL: 121 case user_manager::User::USER_IMAGE_EXTERNAL:
122 user_image = "file"; 122 user_image = "file";
123 break; 123 break;
124 124
125 case user_manager::User::USER_IMAGE_PROFILE: 125 case user_manager::User::USER_IMAGE_PROFILE:
126 user_image = "profile"; 126 user_image = "profile";
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 return new AutotestPrivateAPI(); 337 return new AutotestPrivateAPI();
338 } 338 }
339 339
340 AutotestPrivateAPI::AutotestPrivateAPI() : test_mode_(false) { 340 AutotestPrivateAPI::AutotestPrivateAPI() : test_mode_(false) {
341 } 341 }
342 342
343 AutotestPrivateAPI::~AutotestPrivateAPI() { 343 AutotestPrivateAPI::~AutotestPrivateAPI() {
344 } 344 }
345 345
346 } // namespace extensions 346 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698