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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/arc_terms_of_service_screen.h" 5 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
6 6
7 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_acto r.h" 7 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view .h"
8 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.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 #include "chrome/browser/metrics/metrics_reporting_state.h" 10 #include "chrome/browser/metrics/metrics_reporting_state.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "components/prefs/pref_service.h" 14 #include "components/prefs/pref_service.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 ArcTermsOfServiceScreen::ArcTermsOfServiceScreen( 18 ArcTermsOfServiceScreen::ArcTermsOfServiceScreen(
19 BaseScreenDelegate* base_screen_delegate, 19 BaseScreenDelegate* base_screen_delegate,
20 ArcTermsOfServiceScreenActor* actor) 20 ArcTermsOfServiceScreenView* view)
21 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE), 21 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE),
22 actor_(actor) { 22 view_(view) {
23 DCHECK(actor_); 23 DCHECK(view_);
24 if (actor_) 24 if (view_)
25 actor_->AddObserver(this); 25 view_->AddObserver(this);
26 } 26 }
27 27
28 ArcTermsOfServiceScreen::~ArcTermsOfServiceScreen() { 28 ArcTermsOfServiceScreen::~ArcTermsOfServiceScreen() {
29 if (actor_) 29 if (view_)
30 actor_->RemoveObserver(this); 30 view_->RemoveObserver(this);
31 } 31 }
32 32
33 void ArcTermsOfServiceScreen::Show() { 33 void ArcTermsOfServiceScreen::Show() {
34 if (!actor_) 34 if (!view_)
35 return; 35 return;
36 36
37 // Show the screen. 37 // Show the screen.
38 actor_->Show(); 38 view_->Show();
39 } 39 }
40 40
41 void ArcTermsOfServiceScreen::Hide() { 41 void ArcTermsOfServiceScreen::Hide() {
42 if (actor_) 42 if (view_)
43 actor_->Hide(); 43 view_->Hide();
44 } 44 }
45 45
46 void ArcTermsOfServiceScreen::OnSkip() { 46 void ArcTermsOfServiceScreen::OnSkip() {
47 Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED); 47 Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED);
48 } 48 }
49 49
50 void ArcTermsOfServiceScreen::OnAccept() { 50 void ArcTermsOfServiceScreen::OnAccept() {
51 Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED); 51 Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED);
52 } 52 }
53 53
54 void ArcTermsOfServiceScreen::OnActorDestroyed( 54 void ArcTermsOfServiceScreen::OnViewDestroyed(
55 ArcTermsOfServiceScreenActor* actor) { 55 ArcTermsOfServiceScreenView* view) {
56 DCHECK_EQ(actor, actor_); 56 DCHECK_EQ(view, view_);
57 actor_ = nullptr; 57 view_ = nullptr;
58 } 58 }
59 59
60 } // namespace chromeos 60 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698