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

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

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. 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" 8 #include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
9 #include "chrome/browser/chromeos/login/chrome_restart_request.h" 9 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
10 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h" 10 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
11 #include "chrome/browser/chromeos/login/startup_utils.h" 11 #include "chrome/browser/chromeos/login/startup_utils.h"
12 #include "chrome/browser/chromeos/login/wizard_controller.h" 12 #include "chrome/browser/chromeos/login/wizard_controller.h"
13 #include "chrome/browser/chromeos/settings/cros_settings.h" 13 #include "chrome/browser/chromeos/settings/cros_settings.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 ErrorScreen::ErrorScreen(ScreenObserver* screen_observer, 17 ErrorScreen::ErrorScreen(BaseScreenDelegate* base_screen_delegate,
18 ErrorScreenActor* actor) 18 ErrorScreenActor* actor)
19 : BaseScreen(screen_observer), 19 : BaseScreen(base_screen_delegate),
20 actor_(actor), 20 actor_(actor),
21 parent_screen_(OobeDisplay::SCREEN_UNKNOWN), 21 parent_screen_(OobeDisplay::SCREEN_UNKNOWN),
22 weak_factory_(this) { 22 weak_factory_(this) {
23 CHECK(actor_); 23 CHECK(actor_);
24 actor_->SetDelegate(this); 24 actor_->SetDelegate(this);
25 } 25 }
26 26
27 ErrorScreen::~ErrorScreen() { 27 ErrorScreen::~ErrorScreen() {
28 if (actor_) 28 if (actor_)
29 actor_->SetDelegate(NULL); 29 actor_->SetDelegate(NULL);
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 175 }
176 176
177 if (guest_login_performer_) 177 if (guest_login_performer_)
178 return; 178 return;
179 179
180 guest_login_performer_.reset(new ChromeLoginPerformer(this)); 180 guest_login_performer_.reset(new ChromeLoginPerformer(this));
181 guest_login_performer_->LoginOffTheRecord(); 181 guest_login_performer_->LoginOffTheRecord();
182 } 182 }
183 183
184 } // namespace chromeos 184 } // 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