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

Side by Side Diff: chrome/browser/chromeos/login/screens/error_screen.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/chromeos/login/screens/error_screen.h" 5 #include "chrome/browser/chromeos/login/screens/error_screen.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 browser_command_line, 233 browser_command_line,
234 &command_line); 234 &command_line);
235 235
236 RestartChrome(cmd_line_str); 236 RestartChrome(cmd_line_str);
237 } 237 }
238 238
239 void ErrorScreen::OnPasswordChangeDetected() { 239 void ErrorScreen::OnPasswordChangeDetected() {
240 LOG(FATAL); 240 LOG(FATAL);
241 } 241 }
242 242
243 void ErrorScreen::WhiteListCheckFailed(const std::string& email) { 243 void ErrorScreen::WhiteListCheckFailed(const user_manager::UserID& user_id) {
244 LOG(FATAL); 244 LOG(FATAL);
245 } 245 }
246 246
247 void ErrorScreen::PolicyLoadFailed() { 247 void ErrorScreen::PolicyLoadFailed() {
248 LOG(FATAL); 248 LOG(FATAL);
249 } 249 }
250 250
251 void ErrorScreen::OnOnlineChecked(const std::string& username, bool success) { 251 void ErrorScreen::OnOnlineChecked(const user_manager::UserID& user_id, bool succ ess) {
252 LOG(FATAL); 252 LOG(FATAL);
253 } 253 }
254 254
255 void ErrorScreen::DefaultHideCallback() { 255 void ErrorScreen::DefaultHideCallback() {
256 if (parent_screen_ != OobeUI::SCREEN_UNKNOWN && view_) 256 if (parent_screen_ != OobeUI::SCREEN_UNKNOWN && view_)
257 view_->ShowScreen(parent_screen_); 257 view_->ShowScreen(parent_screen_);
258 258
259 // TODO(antrim): Due to potential race with GAIA reload and hiding network 259 // TODO(antrim): Due to potential race with GAIA reload and hiding network
260 // error UI we can't just reset parent screen to SCREEN_UNKNOWN here. 260 // error UI we can't just reset parent screen to SCREEN_UNKNOWN here.
261 } 261 }
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 } 334 }
335 335
336 if (guest_login_performer_) 336 if (guest_login_performer_)
337 return; 337 return;
338 338
339 guest_login_performer_.reset(new ChromeLoginPerformer(this)); 339 guest_login_performer_.reset(new ChromeLoginPerformer(this));
340 guest_login_performer_->LoginOffTheRecord(); 340 guest_login_performer_->LoginOffTheRecord();
341 } 341 }
342 342
343 } // namespace chromeos 343 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698