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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc

Issue 2556253002: cros: Fold EulaModel into EulaView. (Closed)
Patch Set: Address comments Created 3 years, 11 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/chromeos/login/eula_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/chromeos/login/help_app_launcher.h" 11 #include "chrome/browser/chromeos/login/help_app_launcher.h"
12 #include "chrome/browser/chromeos/login/helper.h" 12 #include "chrome/browser/chromeos/login/helper.h"
13 #include "chrome/browser/chromeos/login/oobe_screen.h" 13 #include "chrome/browser/chromeos/login/oobe_screen.h"
14 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" 14 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
15 #include "chrome/browser/chromeos/login/screens/eula_model.h" 15 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
16 #include "chrome/browser/chromeos/login/ui/login_web_dialog.h" 16 #include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
17 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 17 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
20 #include "chrome/grit/chromium_strings.h" 20 #include "chrome/grit/chromium_strings.h"
21 #include "chrome/grit/generated_resources.h" 21 #include "chrome/grit/generated_resources.h"
22 #include "chrome/grit/locale_settings.h" 22 #include "chrome/grit/locale_settings.h"
23 #include "components/login/localized_values_builder.h" 23 #include "components/login/localized_values_builder.h"
24 #include "components/strings/grit/components_strings.h" 24 #include "components/strings/grit/components_strings.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 dialog->Show(); 77 dialog->Show();
78 // The dialog object will be deleted on dialog close. 78 // The dialog object will be deleted on dialog close.
79 } 79 }
80 80
81 } // namespace 81 } // namespace
82 82
83 namespace chromeos { 83 namespace chromeos {
84 84
85 EulaScreenHandler::EulaScreenHandler(CoreOobeActor* core_oobe_actor) 85 EulaScreenHandler::EulaScreenHandler(CoreOobeActor* core_oobe_actor)
86 : BaseScreenHandler(kJsScreenPath), 86 : BaseScreenHandler(kJsScreenPath),
87 model_(NULL), 87 core_oobe_actor_(core_oobe_actor) {
88 core_oobe_actor_(core_oobe_actor),
89 show_on_init_(false) {
90 } 88 }
91 89
92 EulaScreenHandler::~EulaScreenHandler() { 90 EulaScreenHandler::~EulaScreenHandler() {
93 if (model_) 91 if (screen_)
94 model_->OnViewDestroyed(this); 92 screen_->OnViewDestroyed(this);
95 } 93 }
96 94
97 void EulaScreenHandler::Show() { 95 void EulaScreenHandler::Show() {
98 if (!page_is_ready()) { 96 if (!page_is_ready()) {
99 show_on_init_ = true; 97 show_on_init_ = true;
100 return; 98 return;
101 } 99 }
102 ShowScreen(OobeScreen::SCREEN_OOBE_EULA); 100 ShowScreen(OobeScreen::SCREEN_OOBE_EULA);
103 } 101 }
104 102
105 void EulaScreenHandler::Hide() { 103 void EulaScreenHandler::Hide() {
106 } 104 }
107 105
108 void EulaScreenHandler::Bind(EulaModel& model) { 106 void EulaScreenHandler::Bind(EulaScreen* screen) {
109 model_ = &model; 107 screen_ = screen;
110 BaseScreenHandler::SetBaseScreen(model_); 108 BaseScreenHandler::SetBaseScreen(screen_);
111 if (page_is_ready()) 109 if (page_is_ready())
112 Initialize(); 110 Initialize();
113 } 111 }
114 112
115 void EulaScreenHandler::Unbind() { 113 void EulaScreenHandler::Unbind() {
116 model_ = nullptr; 114 screen_ = nullptr;
117 BaseScreenHandler::SetBaseScreen(nullptr); 115 BaseScreenHandler::SetBaseScreen(nullptr);
118 } 116 }
119 117
120 void EulaScreenHandler::DeclareLocalizedValues( 118 void EulaScreenHandler::DeclareLocalizedValues(
121 ::login::LocalizedValuesBuilder* builder) { 119 ::login::LocalizedValuesBuilder* builder) {
122 builder->Add("eulaScreenTitle", IDS_EULA_SCREEN_TITLE); 120 builder->Add("eulaScreenTitle", IDS_EULA_SCREEN_TITLE);
123 builder->Add("eulaScreenAccessibleTitle", IDS_EULA_SCREEN_ACCESSIBLE_TITLE); 121 builder->Add("eulaScreenAccessibleTitle", IDS_EULA_SCREEN_ACCESSIBLE_TITLE);
124 builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING); 122 builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING);
125 builder->Add("back", IDS_EULA_BACK_BUTTON); 123 builder->Add("back", IDS_EULA_BACK_BUTTON);
126 builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON); 124 builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 161
164 void EulaScreenHandler::GetAdditionalParameters(base::DictionaryValue* dict) { 162 void EulaScreenHandler::GetAdditionalParameters(base::DictionaryValue* dict) {
165 #if BUILDFLAG(ENABLE_RLZ) 163 #if BUILDFLAG(ENABLE_RLZ)
166 dict->SetString("rlzEnabled", "enabled"); 164 dict->SetString("rlzEnabled", "enabled");
167 #else 165 #else
168 dict->SetString("rlzEnabled", "disabled"); 166 dict->SetString("rlzEnabled", "disabled");
169 #endif 167 #endif
170 } 168 }
171 169
172 void EulaScreenHandler::Initialize() { 170 void EulaScreenHandler::Initialize() {
173 if (!page_is_ready() || !model_) 171 if (!page_is_ready() || !screen_)
174 return; 172 return;
175 173
176 core_oobe_actor_->SetUsageStats(model_->IsUsageStatsEnabled()); 174 core_oobe_actor_->SetUsageStats(screen_->IsUsageStatsEnabled());
177 175
178 // This OEM EULA is a file:// URL which we're unable to load in iframe. 176 // This OEM EULA is a file:// URL which we're unable to load in iframe.
179 // Instead if it's defined we use chrome://terms/oem that will load same file. 177 // Instead if it's defined we use chrome://terms/oem that will load same file.
180 if (!model_->GetOemEulaUrl().is_empty()) 178 if (!screen_->GetOemEulaUrl().is_empty())
181 core_oobe_actor_->SetOemEulaUrl(chrome::kChromeUITermsOemURL); 179 core_oobe_actor_->SetOemEulaUrl(chrome::kChromeUITermsOemURL);
182 180
183 if (show_on_init_) { 181 if (show_on_init_) {
184 Show(); 182 Show();
185 show_on_init_ = false; 183 show_on_init_ = false;
186 } 184 }
187 } 185 }
188 186
189 void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) { 187 void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
190 core_oobe_actor_->SetTpmPassword(tpm_password); 188 core_oobe_actor_->SetTpmPassword(tpm_password);
(...skipping 17 matching lines...) Expand all
208 void EulaScreenHandler::HandleOnChromeCredits() { 206 void EulaScreenHandler::HandleOnChromeCredits() {
209 ShowCreditsDialog( 207 ShowCreditsDialog(
210 Profile::FromBrowserContext( 208 Profile::FromBrowserContext(
211 web_ui()->GetWebContents()->GetBrowserContext()), 209 web_ui()->GetWebContents()->GetBrowserContext()),
212 GetNativeWindow(), 210 GetNativeWindow(),
213 IDS_ABOUT_VERSION_LICENSE_EULA, 211 IDS_ABOUT_VERSION_LICENSE_EULA,
214 GURL(chrome::kChromeUICreditsURL)); 212 GURL(chrome::kChromeUICreditsURL));
215 } 213 }
216 214
217 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() { 215 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
218 if (model_) 216 if (screen_)
219 model_->InitiatePasswordFetch(); 217 screen_->InitiatePasswordFetch();
220 } 218 }
221 219
222 } // namespace chromeos 220 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698