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

Side by Side Diff: chrome/browser/chromeos/login/crash_restore_browsertest.cc

Issue 15718003: Add SessionStateObserver with ActiveUserChanged() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge & reviews Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 public UserManager::UserSessionStateObserver { 73 public UserManager::UserSessionStateObserver {
74 public: 74 public:
75 UserSessionRestoreObserver() 75 UserSessionRestoreObserver()
76 : running_loop_(false), 76 : running_loop_(false),
77 user_sessions_restored_(UserManager::Get()->UserSessionsRestored()) { 77 user_sessions_restored_(UserManager::Get()->UserSessionsRestored()) {
78 if (!user_sessions_restored_) 78 if (!user_sessions_restored_)
79 UserManager::Get()->AddSessionStateObserver(this); 79 UserManager::Get()->AddSessionStateObserver(this);
80 } 80 }
81 virtual ~UserSessionRestoreObserver() {} 81 virtual ~UserSessionRestoreObserver() {}
82 82
83 virtual void ActiveUserHashChanged(const std::string& hash) OVERRIDE {
84 }
85 virtual void PendingUserSessionsRestoreFinished() OVERRIDE { 83 virtual void PendingUserSessionsRestoreFinished() OVERRIDE {
86 user_sessions_restored_ = true; 84 user_sessions_restored_ = true;
87 UserManager::Get()->RemoveSessionStateObserver(this); 85 UserManager::Get()->RemoveSessionStateObserver(this);
88 if (!running_loop_) 86 if (!running_loop_)
89 return; 87 return;
90 88
91 message_loop_runner_->Quit(); 89 message_loop_runner_->Quit();
92 running_loop_ = false; 90 running_loop_ = false;
93 } 91 }
94 92
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 users[0]->username_hash()); 147 users[0]->username_hash());
150 EXPECT_EQ(kUserId2, users[1]->email()); 148 EXPECT_EQ(kUserId2, users[1]->email());
151 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2), 149 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2),
152 users[1]->username_hash()); 150 users[1]->username_hash());
153 EXPECT_EQ(kUserId1, users[2]->email()); 151 EXPECT_EQ(kUserId1, users[2]->email());
154 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1), 152 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
155 users[2]->username_hash()); 153 users[2]->username_hash());
156 } 154 }
157 155
158 } // namespace chromeos 156 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698