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

Side by Side Diff: chrome/browser/chromeos/login/screens/terms_of_service_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/terms_of_service_screen.h" 5 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 14 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
15 #include "chrome/browser/chromeos/login/wizard_controller.h" 15 #include "chrome/browser/chromeos/login/wizard_controller.h"
16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "net/http/http_response_headers.h" 20 #include "net/http/http_response_headers.h"
21 #include "net/url_request/url_fetcher.h" 21 #include "net/url_request/url_fetcher.h"
22 #include "net/url_request/url_request_context_getter.h" 22 #include "net/url_request/url_request_context_getter.h"
23 #include "net/url_request/url_request_status.h" 23 #include "net/url_request/url_request_status.h"
24 #include "url/gurl.h" 24 #include "url/gurl.h"
25 25
26 namespace chromeos { 26 namespace chromeos {
27 27
28 TermsOfServiceScreen::TermsOfServiceScreen(ScreenObserver* screen_observer, 28 TermsOfServiceScreen::TermsOfServiceScreen(
29 TermsOfServiceScreenActor* actor) 29 BaseScreenDelegate* base_screen_delegate,
30 : BaseScreen(screen_observer), actor_(actor) { 30 TermsOfServiceScreenActor* actor)
31 : BaseScreen(base_screen_delegate), actor_(actor) {
31 DCHECK(actor_); 32 DCHECK(actor_);
32 if (actor_) 33 if (actor_)
33 actor_->SetDelegate(this); 34 actor_->SetDelegate(this);
34 } 35 }
35 36
36 TermsOfServiceScreen::~TermsOfServiceScreen() { 37 TermsOfServiceScreen::~TermsOfServiceScreen() {
37 if (actor_) 38 if (actor_)
38 actor_->SetDelegate(NULL); 39 actor_->SetDelegate(NULL);
39 } 40 }
40 41
(...skipping 19 matching lines...) Expand all
60 void TermsOfServiceScreen::Hide() { 61 void TermsOfServiceScreen::Hide() {
61 if (actor_) 62 if (actor_)
62 actor_->Hide(); 63 actor_->Hide();
63 } 64 }
64 65
65 std::string TermsOfServiceScreen::GetName() const { 66 std::string TermsOfServiceScreen::GetName() const {
66 return WizardController::kTermsOfServiceScreenName; 67 return WizardController::kTermsOfServiceScreenName;
67 } 68 }
68 69
69 void TermsOfServiceScreen::OnDecline() { 70 void TermsOfServiceScreen::OnDecline() {
70 get_screen_observer()->OnExit(ScreenObserver::TERMS_OF_SERVICE_DECLINED); 71 get_base_screen_delegate()->OnExit(
72 BaseScreenDelegate::TERMS_OF_SERVICE_DECLINED);
71 } 73 }
72 74
73 void TermsOfServiceScreen::OnAccept() { 75 void TermsOfServiceScreen::OnAccept() {
74 get_screen_observer()->OnExit(ScreenObserver::TERMS_OF_SERVICE_ACCEPTED); 76 get_base_screen_delegate()->OnExit(
77 BaseScreenDelegate::TERMS_OF_SERVICE_ACCEPTED);
75 } 78 }
76 79
77 void TermsOfServiceScreen::OnActorDestroyed(TermsOfServiceScreenActor* actor) { 80 void TermsOfServiceScreen::OnActorDestroyed(TermsOfServiceScreenActor* actor) {
78 if (actor_ == actor) 81 if (actor_ == actor)
79 actor_ = NULL; 82 actor_ = NULL;
80 } 83 }
81 84
82 void TermsOfServiceScreen::StartDownload() { 85 void TermsOfServiceScreen::StartDownload() {
83 const PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs(); 86 const PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
84 // If an URL from which the Terms of Service can be downloaded has not been 87 // If an URL from which the Terms of Service can be downloaded has not been
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 !source->GetResponseAsString(&terms_of_service)) { 144 !source->GetResponseAsString(&terms_of_service)) {
142 actor_->OnLoadError(); 145 actor_->OnLoadError();
143 } else { 146 } else {
144 // If the Terms of Service were downloaded successfully, show them to the 147 // If the Terms of Service were downloaded successfully, show them to the
145 // user. 148 // user.
146 actor_->OnLoadSuccess(terms_of_service); 149 actor_->OnLoadSuccess(terms_of_service);
147 } 150 }
148 } 151 }
149 152
150 } // namespace chromeos 153 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/terms_of_service_screen.h ('k') | chrome/browser/chromeos/login/screens/update_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698