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

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: Reverted change to web_ui_browser_test.cc that was moved to another CL. Created 4 years, 5 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 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 localized_strings->SetString("bootIntoWallpaper", "off"); 492 localized_strings->SetString("bootIntoWallpaper", "off");
493 } 493 }
494 494
495 bool keyboard_driven_oobe = 495 bool keyboard_driven_oobe =
496 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation(); 496 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
497 localized_strings->SetString("highlightStrength", 497 localized_strings->SetString("highlightStrength",
498 keyboard_driven_oobe ? "strong" : "normal"); 498 keyboard_driven_oobe ? "strong" : "normal");
499 499
500 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI(); 500 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
501 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off"); 501 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
502 localized_strings->SetString("newOobeUI", UseMDOobe() ? "on" : "off");
502 503
503 localized_strings->SetString("newOobeUI", UseMDOobe() ? "on" : "off"); 504 NetworkUI::GetLocalizedStrings(localized_strings);
504 } 505 }
505 506
506 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 507 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
507 web_ui()->AddMessageHandler(handler); 508 web_ui()->AddMessageHandler(handler);
508 handlers_.push_back(handler); 509 handlers_.push_back(handler);
509 } 510 }
510 511
511 void OobeUI::InitializeHandlers() { 512 void OobeUI::InitializeHandlers() {
512 ready_ = true; 513 ready_ = true;
513 for (size_t i = 0; i < ready_callbacks_.size(); ++i) 514 for (size_t i = 0; i < ready_callbacks_.size(); ++i)
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 NOTIMPLEMENTED(); 601 NOTIMPLEMENTED();
601 } 602 }
602 603
603 FOR_EACH_OBSERVER(Observer, 604 FOR_EACH_OBSERVER(Observer,
604 observer_list_, 605 observer_list_,
605 OnCurrentScreenChanged(current_screen_, new_screen)); 606 OnCurrentScreenChanged(current_screen_, new_screen));
606 current_screen_ = new_screen; 607 current_screen_ = new_screen;
607 } 608 }
608 609
609 } // namespace chromeos 610 } // 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