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

Side by Side Diff: chrome/browser/chromeos/login/screens/wrong_hwid_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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/wrong_hwid_screen.h" 5 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
6 6
7 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 7 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
8 #include "chrome/browser/chromeos/login/wizard_controller.h" 8 #include "chrome/browser/chromeos/login/wizard_controller.h"
9 9
10 namespace chromeos { 10 namespace chromeos {
11 11
12 WrongHWIDScreen::WrongHWIDScreen(ScreenObserver* observer, 12 WrongHWIDScreen::WrongHWIDScreen(BaseScreenDelegate* base_screen_delegate,
13 WrongHWIDScreenActor* actor) 13 WrongHWIDScreenActor* actor)
14 : BaseScreen(observer), actor_(actor) { 14 : BaseScreen(base_screen_delegate), actor_(actor) {
15 DCHECK(actor_); 15 DCHECK(actor_);
16 if (actor_) 16 if (actor_)
17 actor_->SetDelegate(this); 17 actor_->SetDelegate(this);
18 } 18 }
19 19
20 WrongHWIDScreen::~WrongHWIDScreen() { 20 WrongHWIDScreen::~WrongHWIDScreen() {
21 if (actor_) 21 if (actor_)
22 actor_->SetDelegate(NULL); 22 actor_->SetDelegate(NULL);
23 } 23 }
24 24
(...skipping 10 matching lines...) Expand all
35 void WrongHWIDScreen::Hide() { 35 void WrongHWIDScreen::Hide() {
36 if (actor_) 36 if (actor_)
37 actor_->Hide(); 37 actor_->Hide();
38 } 38 }
39 39
40 std::string WrongHWIDScreen::GetName() const { 40 std::string WrongHWIDScreen::GetName() const {
41 return WizardController::kWrongHWIDScreenName; 41 return WizardController::kWrongHWIDScreenName;
42 } 42 }
43 43
44 void WrongHWIDScreen::OnExit() { 44 void WrongHWIDScreen::OnExit() {
45 get_screen_observer()->OnExit(ScreenObserver::WRONG_HWID_WARNING_SKIPPED); 45 get_base_screen_delegate()->OnExit(
46 BaseScreenDelegate::WRONG_HWID_WARNING_SKIPPED);
46 } 47 }
47 48
48 void WrongHWIDScreen::OnActorDestroyed(WrongHWIDScreenActor* actor) { 49 void WrongHWIDScreen::OnActorDestroyed(WrongHWIDScreenActor* 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
54 55
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698