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

Side by Side Diff: chrome/browser/chromeos/login/screens/hid_detection_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/hid_detection_screen.h" 5 #include "chrome/browser/chromeos/login/screens/hid_detection_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 HIDDetectionScreen::HIDDetectionScreen(ScreenObserver* observer, 12 HIDDetectionScreen::HIDDetectionScreen(BaseScreenDelegate* base_screen_delegate,
13 HIDDetectionScreenActor* actor) 13 HIDDetectionScreenActor* 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 HIDDetectionScreen::~HIDDetectionScreen() { 20 HIDDetectionScreen::~HIDDetectionScreen() {
21 if (actor_) 21 if (actor_)
22 actor_->SetDelegate(NULL); 22 actor_->SetDelegate(NULL);
23 } 23 }
24 24
25 void HIDDetectionScreen::PrepareToShow() { 25 void HIDDetectionScreen::PrepareToShow() {
26 } 26 }
27 27
28 void HIDDetectionScreen::Show() { 28 void HIDDetectionScreen::Show() {
29 if (actor_) 29 if (actor_)
30 actor_->Show(); 30 actor_->Show();
31 } 31 }
32 32
33 void HIDDetectionScreen::Hide() { 33 void HIDDetectionScreen::Hide() {
34 if (actor_) 34 if (actor_)
35 actor_->Hide(); 35 actor_->Hide();
36 } 36 }
37 37
38 std::string HIDDetectionScreen::GetName() const { 38 std::string HIDDetectionScreen::GetName() const {
39 return WizardController::kHIDDetectionScreenName; 39 return WizardController::kHIDDetectionScreenName;
40 } 40 }
41 41
42 void HIDDetectionScreen::OnExit() { 42 void HIDDetectionScreen::OnExit() {
43 get_screen_observer()->OnExit(ScreenObserver::HID_DETECTION_COMPLETED); 43 get_base_screen_delegate()->OnExit(
44 BaseScreenDelegate::HID_DETECTION_COMPLETED);
44 } 45 }
45 46
46 void HIDDetectionScreen::OnActorDestroyed(HIDDetectionScreenActor* actor) { 47 void HIDDetectionScreen::OnActorDestroyed(HIDDetectionScreenActor* actor) {
47 if (actor_ == actor) 48 if (actor_ == actor)
48 actor_ = NULL; 49 actor_ = NULL;
49 } 50 }
50 51
51 } // namespace chromeos 52 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698