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

Side by Side Diff: chrome/browser/chromeos/login/screens/error_screen.cc

Issue 681593003: Revert of Extract LoginPerformer to chromeos/auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
9 #include "chrome/browser/chromeos/login/chrome_restart_request.h" 8 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
10 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h" 9 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
11 #include "chrome/browser/chromeos/login/startup_utils.h" 10 #include "chrome/browser/chromeos/login/startup_utils.h"
12 #include "chrome/browser/chromeos/login/wizard_controller.h" 11 #include "chrome/browser/chromeos/login/wizard_controller.h"
13 #include "chrome/browser/chromeos/settings/cros_settings.h" 12 #include "chrome/browser/chromeos/settings/cros_settings.h"
14 13
15 namespace chromeos { 14 namespace chromeos {
16 15
17 ErrorScreen::ErrorScreen(ScreenObserver* screen_observer, 16 ErrorScreen::ErrorScreen(ScreenObserver* screen_observer,
18 ErrorScreenActor* actor) 17 ErrorScreenActor* actor)
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 CrosSettings::Get()->GetBoolean(kAccountsPrefAllowGuest, &allow_guest); 164 CrosSettings::Get()->GetBoolean(kAccountsPrefAllowGuest, &allow_guest);
166 if (allow_guest) 165 if (allow_guest)
167 break; 166 break;
168 return; 167 return;
169 } 168 }
170 } 169 }
171 170
172 if (guest_login_performer_) 171 if (guest_login_performer_)
173 return; 172 return;
174 173
175 guest_login_performer_.reset(new ChromeLoginPerformer(this)); 174 guest_login_performer_.reset(new LoginPerformer(this));
176 guest_login_performer_->LoginOffTheRecord(); 175 guest_login_performer_->LoginOffTheRecord();
177 } 176 }
178 177
179 } // namespace chromeos 178 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/error_screen.h ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698