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

Side by Side Diff: chrome/browser/chromeos/login/screens/reset_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/reset_screen.h" 5 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 8 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
9 #include "chrome/browser/chromeos/login/wizard_controller.h" 9 #include "chrome/browser/chromeos/login/wizard_controller.h"
10 10
11 namespace chromeos { 11 namespace chromeos {
12 12
13 ResetScreen::ResetScreen(ScreenObserver* observer, ResetScreenActor* actor) 13 ResetScreen::ResetScreen(BaseScreenDelegate* base_screen_delegate,
14 : BaseScreen(observer), actor_(actor) { 14 ResetScreenActor* actor)
15 : BaseScreen(base_screen_delegate), actor_(actor) {
15 DCHECK(actor_); 16 DCHECK(actor_);
16 if (actor_) 17 if (actor_)
17 actor_->SetDelegate(this); 18 actor_->SetDelegate(this);
18 } 19 }
19 20
20 ResetScreen::~ResetScreen() { 21 ResetScreen::~ResetScreen() {
21 if (actor_) 22 if (actor_)
22 actor_->SetDelegate(NULL); 23 actor_->SetDelegate(NULL);
23 } 24 }
24 25
(...skipping 10 matching lines...) Expand all
35 void ResetScreen::Hide() { 36 void ResetScreen::Hide() {
36 if (actor_) 37 if (actor_)
37 actor_->Hide(); 38 actor_->Hide();
38 } 39 }
39 40
40 std::string ResetScreen::GetName() const { 41 std::string ResetScreen::GetName() const {
41 return WizardController::kResetScreenName; 42 return WizardController::kResetScreenName;
42 } 43 }
43 44
44 void ResetScreen::OnExit() { 45 void ResetScreen::OnExit() {
45 get_screen_observer()->OnExit(ScreenObserver::RESET_CANCELED); 46 get_base_screen_delegate()->OnExit(BaseScreenDelegate::RESET_CANCELED);
46 } 47 }
47 48
48 void ResetScreen::OnActorDestroyed(ResetScreenActor* actor) { 49 void ResetScreen::OnActorDestroyed(ResetScreenActor* actor) {
49 if (actor_ == actor) 50 if (actor_ == actor)
50 actor_ = NULL; 51 actor_ = NULL;
51 } 52 }
52 53
53 } // namespace chromeos 54 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/reset_screen.h ('k') | chrome/browser/chromeos/login/screens/screen_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698