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

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

Issue 2067153002: ChromeOS: Implement Network Selection screen of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 6 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 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 localized_strings->SetString("bootIntoWallpaper", "off"); 499 localized_strings->SetString("bootIntoWallpaper", "off");
500 } 500 }
501 501
502 bool keyboard_driven_oobe = 502 bool keyboard_driven_oobe =
503 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation(); 503 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
504 localized_strings->SetString("highlightStrength", 504 localized_strings->SetString("highlightStrength",
505 keyboard_driven_oobe ? "strong" : "normal"); 505 keyboard_driven_oobe ? "strong" : "normal");
506 506
507 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI(); 507 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
508 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off"); 508 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
509 localized_strings->SetString("newOobeUI", UseMDOobe() ? "on" : "off");
509 510
510 localized_strings->SetString("newOobeUI", UseMDOobe() ? "on" : "off"); 511 NetworkUI::GetLocalizedStrings(localized_strings);
511 } 512 }
512 513
513 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 514 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
514 web_ui()->AddMessageHandler(handler); 515 web_ui()->AddMessageHandler(handler);
515 handlers_.push_back(handler); 516 handlers_.push_back(handler);
516 } 517 }
517 518
518 void OobeUI::InitializeHandlers() { 519 void OobeUI::InitializeHandlers() {
519 ready_ = true; 520 ready_ = true;
520 for (size_t i = 0; i < ready_callbacks_.size(); ++i) 521 for (size_t i = 0; i < ready_callbacks_.size(); ++i)
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 NOTIMPLEMENTED(); 608 NOTIMPLEMENTED();
608 } 609 }
609 610
610 FOR_EACH_OBSERVER(Observer, 611 FOR_EACH_OBSERVER(Observer,
611 observer_list_, 612 observer_list_,
612 OnCurrentScreenChanged(current_screen_, new_screen)); 613 OnCurrentScreenChanged(current_screen_, new_screen));
613 current_screen_ = new_screen; 614 current_screen_ = new_screen;
614 } 615 }
615 616
616 } // namespace chromeos 617 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/network_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698