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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 years, 9 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) 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/base_screen_delegate.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(BaseScreenDelegate* base_screen_delegate, 12 WrongHWIDScreen::WrongHWIDScreen(BaseScreenDelegate* base_screen_delegate,
13 WrongHWIDScreenActor* actor) 13 WrongHWIDScreenView* view)
14 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_WRONG_HWID), 14 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_WRONG_HWID),
15 actor_(actor) { 15 view_(view) {
16 DCHECK(actor_); 16 DCHECK(view_);
17 if (actor_) 17 if (view_)
18 actor_->SetDelegate(this); 18 view_->SetDelegate(this);
19 } 19 }
20 20
21 WrongHWIDScreen::~WrongHWIDScreen() { 21 WrongHWIDScreen::~WrongHWIDScreen() {
22 if (actor_) 22 if (view_)
23 actor_->SetDelegate(NULL); 23 view_->SetDelegate(nullptr);
24 } 24 }
25 25
26 void WrongHWIDScreen::Show() { 26 void WrongHWIDScreen::Show() {
27 if (actor_) 27 if (view_)
28 actor_->Show(); 28 view_->Show();
29 } 29 }
30 30
31 void WrongHWIDScreen::Hide() { 31 void WrongHWIDScreen::Hide() {
32 if (actor_) 32 if (view_)
33 actor_->Hide(); 33 view_->Hide();
34 } 34 }
35 35
36 void WrongHWIDScreen::OnExit() { 36 void WrongHWIDScreen::OnExit() {
37 Finish(BaseScreenDelegate::WRONG_HWID_WARNING_SKIPPED); 37 Finish(BaseScreenDelegate::WRONG_HWID_WARNING_SKIPPED);
38 } 38 }
39 39
40 void WrongHWIDScreen::OnActorDestroyed(WrongHWIDScreenActor* actor) { 40 void WrongHWIDScreen::OnViewDestroyed(WrongHWIDScreenView* view) {
41 if (actor_ == actor) 41 if (view_ == view)
42 actor_ = NULL; 42 view_ = nullptr;
43 } 43 }
44 44
45 } // namespace chromeos 45 } // namespace chromeos
46 46
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698