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

Side by Side Diff: components/user_manager/user.cc

Issue 1262883003: Revert of Added affiliation IDs for the new affiliation determination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « components/user_manager/user.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/user_manager/user.h" 5 #include "components/user_manager/user.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 User::User(const std::string& email) 198 User::User(const std::string& email)
199 : email_(email), 199 : email_(email),
200 oauth_token_status_(OAUTH_TOKEN_STATUS_UNKNOWN), 200 oauth_token_status_(OAUTH_TOKEN_STATUS_UNKNOWN),
201 force_online_signin_(false), 201 force_online_signin_(false),
202 image_index_(USER_IMAGE_INVALID), 202 image_index_(USER_IMAGE_INVALID),
203 image_is_stub_(false), 203 image_is_stub_(false),
204 image_is_loading_(false), 204 image_is_loading_(false),
205 can_lock_(false), 205 can_lock_(false),
206 is_logged_in_(false), 206 is_logged_in_(false),
207 is_active_(false), 207 is_active_(false),
208 profile_is_created_(false), 208 profile_is_created_(false) {
209 is_affiliated_(false){
210 } 209 }
211 210
212 User::~User() { 211 User::~User() {
213 } 212 }
214 213
215 void User::SetAccountLocale(const std::string& resolved_account_locale) { 214 void User::SetAccountLocale(const std::string& resolved_account_locale) {
216 account_locale_.reset(new std::string(resolved_account_locale)); 215 account_locale_.reset(new std::string(resolved_account_locale));
217 } 216 }
218 217
219 void User::SetImage(const UserImage& user_image, int image_index) { 218 void User::SetImage(const UserImage& user_image, int image_index) {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 case user_manager::USER_TYPE_SUPERVISED: 319 case user_manager::USER_TYPE_SUPERVISED:
321 case user_manager::USER_TYPE_KIOSK_APP: 320 case user_manager::USER_TYPE_KIOSK_APP:
322 return false; 321 return false;
323 default: 322 default:
324 NOTREACHED(); 323 NOTREACHED();
325 } 324 }
326 return false; 325 return false;
327 } 326 }
328 327
329 } // namespace user_manager 328 } // namespace user_manager
OLDNEW
« no previous file with comments | « components/user_manager/user.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698