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

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

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chromeos/login/chrome_restart_request.h" 8 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
9 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h" 9 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
10 #include "chrome/browser/chromeos/login/startup_utils.h" 10 #include "chrome/browser/chromeos/login/startup_utils.h"
11 #include "chrome/browser/chromeos/login/wizard_controller.h" 11 #include "chrome/browser/chromeos/login/wizard_controller.h"
12 #include "chrome/browser/chromeos/settings/cros_settings.h" 12 #include "chrome/browser/chromeos/settings/cros_settings.h"
13 13
14 namespace chromeos { 14 namespace chromeos {
15 15
16 ErrorScreen::ErrorScreen(ScreenObserver* screen_observer, 16 ErrorScreen::ErrorScreen(ScreenObserver* screen_observer,
17 ErrorScreenActor* actor) 17 ErrorScreenActor* actor)
18 : WizardScreen(screen_observer), 18 : BaseScreen(screen_observer),
19 actor_(actor), 19 actor_(actor),
20 parent_screen_(OobeDisplay::SCREEN_UNKNOWN), 20 parent_screen_(OobeDisplay::SCREEN_UNKNOWN),
21 weak_factory_(this) { 21 weak_factory_(this) {
22 CHECK(actor_); 22 CHECK(actor_);
23 actor_->SetDelegate(this); 23 actor_->SetDelegate(this);
24 } 24 }
25 25
26 ErrorScreen::~ErrorScreen() { 26 ErrorScreen::~ErrorScreen() {
27 if (actor_) 27 if (actor_)
28 actor_->SetDelegate(NULL); 28 actor_->SetDelegate(NULL);
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 169 }
170 170
171 if (guest_login_performer_) 171 if (guest_login_performer_)
172 return; 172 return;
173 173
174 guest_login_performer_.reset(new LoginPerformer(this)); 174 guest_login_performer_.reset(new LoginPerformer(this));
175 guest_login_performer_->LoginOffTheRecord(); 175 guest_login_performer_->LoginOffTheRecord();
176 } 176 }
177 177
178 } // namespace chromeos 178 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/error_screen.h ('k') | chrome/browser/chromeos/login/screens/eula_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698