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

Unified Diff: chrome/browser/chromeos/login/user_manager.cc

Issue 8976012: chromeos: Implement power button animations for Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update copyright year to 2012 Created 8 years, 12 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
Index: chrome/browser/chromeos/login/user_manager.cc
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index 623d71cd4288020edc99457c5f475c6af0d5c4a7..f56f299466091a1230429856359fc9271a0878c1 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -596,8 +596,8 @@ void UserManager::NotifyLocalStateChanged() {
// Protected constructor and destructor.
UserManager::UserManager()
: ALLOW_THIS_IN_INITIALIZER_LIST(image_loader_(new UserImageLoader)),
- guest_user_(kGuestUser),
- stub_user_(kStubUser),
+ guest_user_(kGuestUser, true),
+ stub_user_(kStubUser, false),
logged_in_user_(NULL),
current_user_is_owner_(false),
current_user_is_new_(false),
@@ -980,7 +980,7 @@ void UserManager::OnDownloadComplete(ProfileDownloader* downloader,
}
User* UserManager::CreateUser(const std::string& email) const {
- User* user = new User(email);
+ User* user = new User(email, email == kGuestUser);
user->set_oauth_token_status(LoadUserOAuthStatus(email));
// Used to determine whether user's display name is unique.
++display_name_count_[user->GetDisplayName()];
« no previous file with comments | « chrome/browser/chromeos/login/user.cc ('k') | chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698