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

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

Issue 2697063004: Fix of "login is not defined" error in OOBE (Closed)
Patch Set: Merge 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) 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/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash"; 206 const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash";
207 const char OobeUI::kArcKioskSplashDisplay[] = "arc-kiosk-splash"; 207 const char OobeUI::kArcKioskSplashDisplay[] = "arc-kiosk-splash";
208 208
209 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 209 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
210 : WebUIController(web_ui) { 210 : WebUIController(web_ui) {
211 display_type_ = GetDisplayType(url); 211 display_type_ = GetDisplayType(url);
212 212
213 network_state_informer_ = new NetworkStateInformer(); 213 network_state_informer_ = new NetworkStateInformer();
214 network_state_informer_->Init(); 214 network_state_informer_->Init();
215 215
216 auto core_handler = base::MakeUnique<CoreOobeHandler>(this); 216 js_calls_container = base::MakeUnique<JSCallsContainer>();
217
218 auto core_handler =
219 base::MakeUnique<CoreOobeHandler>(this, js_calls_container.get());
217 core_handler_ = core_handler.get(); 220 core_handler_ = core_handler.get();
218 AddScreenHandler(std::move(core_handler)); 221 AddScreenHandler(std::move(core_handler));
219 core_handler_->SetDelegate(this); 222 core_handler_->SetDelegate(this);
220 223
221 auto network_dropdown_handler = base::MakeUnique<NetworkDropdownHandler>(); 224 auto network_dropdown_handler = base::MakeUnique<NetworkDropdownHandler>();
222 network_dropdown_handler_ = network_dropdown_handler.get(); 225 network_dropdown_handler_ = network_dropdown_handler.get();
223 AddScreenHandler(std::move(network_dropdown_handler)); 226 AddScreenHandler(std::move(network_dropdown_handler));
224 227
225 auto update_screen_handler = base::MakeUnique<UpdateScreenHandler>(); 228 auto update_screen_handler = base::MakeUnique<UpdateScreenHandler>();
226 update_view_ = update_screen_handler.get(); 229 update_view_ = update_screen_handler.get();
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 user_board_screen_handler_ = user_board_screen_handler.get(); 311 user_board_screen_handler_ = user_board_screen_handler.get();
309 AddScreenHandler(std::move(user_board_screen_handler)); 312 AddScreenHandler(std::move(user_board_screen_handler));
310 313
311 auto gaia_screen_handler = base::MakeUnique<GaiaScreenHandler>( 314 auto gaia_screen_handler = base::MakeUnique<GaiaScreenHandler>(
312 core_handler_, network_state_informer_); 315 core_handler_, network_state_informer_);
313 gaia_screen_handler_ = gaia_screen_handler.get(); 316 gaia_screen_handler_ = gaia_screen_handler.get();
314 AddScreenHandler(std::move(gaia_screen_handler)); 317 AddScreenHandler(std::move(gaia_screen_handler));
315 318
316 auto signin_screen_handler = base::MakeUnique<SigninScreenHandler>( 319 auto signin_screen_handler = base::MakeUnique<SigninScreenHandler>(
317 network_state_informer_, error_screen, core_handler_, 320 network_state_informer_, error_screen, core_handler_,
318 gaia_screen_handler_); 321 gaia_screen_handler_, js_calls_container.get());
319 signin_screen_handler_ = signin_screen_handler.get(); 322 signin_screen_handler_ = signin_screen_handler.get();
320 AddScreenHandler(std::move(signin_screen_handler)); 323 AddScreenHandler(std::move(signin_screen_handler));
321 324
322 auto app_launch_splash_screen_handler = 325 auto app_launch_splash_screen_handler =
323 base::MakeUnique<AppLaunchSplashScreenHandler>(network_state_informer_, 326 base::MakeUnique<AppLaunchSplashScreenHandler>(network_state_informer_,
324 error_screen); 327 error_screen);
325 app_launch_splash_screen_view_ = app_launch_splash_screen_handler.get(); 328 app_launch_splash_screen_view_ = app_launch_splash_screen_handler.get();
326 AddScreenHandler(std::move(app_launch_splash_screen_handler)); 329 AddScreenHandler(std::move(app_launch_splash_screen_handler));
327 330
328 auto arc_kiosk_splash_screen_handler = 331 auto arc_kiosk_splash_screen_handler =
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) { 640 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) {
638 return; 641 return;
639 } 642 }
640 643
641 base::DictionaryValue localized_strings; 644 base::DictionaryValue localized_strings;
642 GetLocalizedStrings(&localized_strings); 645 GetLocalizedStrings(&localized_strings);
643 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); 646 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
644 } 647 }
645 648
646 } // namespace chromeos 649 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698