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

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

Issue 2281813002: ChromeOS: Restrict material-design OOBE to compatible devices only. (Closed)
Patch Set: Created 4 years, 3 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/oobe_ui.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/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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 localized_strings->SetString("bootIntoWallpaper", "off"); 486 localized_strings->SetString("bootIntoWallpaper", "off");
487 } 487 }
488 488
489 bool keyboard_driven_oobe = 489 bool keyboard_driven_oobe =
490 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation(); 490 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
491 localized_strings->SetString("highlightStrength", 491 localized_strings->SetString("highlightStrength",
492 keyboard_driven_oobe ? "strong" : "normal"); 492 keyboard_driven_oobe ? "strong" : "normal");
493 493
494 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI(); 494 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
495 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off"); 495 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
496 localized_strings->SetString("newOobeUI", UseMDOobe() ? "on" : "off"); 496 localized_strings->SetString(
497 "newOobeUI", (md_oobe_enabled_ && UseMDOobe()) ? "on" : "off");
497 } 498 }
498 499
499 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 500 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
500 web_ui()->AddMessageHandler(handler); 501 web_ui()->AddMessageHandler(handler);
501 handlers_.push_back(handler); 502 handlers_.push_back(handler);
502 } 503 }
503 504
504 void OobeUI::InitializeHandlers() { 505 void OobeUI::InitializeHandlers() {
505 ready_ = true; 506 ready_ = true;
506 for (size_t i = 0; i < ready_callbacks_.size(); ++i) 507 for (size_t i = 0; i < ready_callbacks_.size(); ++i)
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 } else { 593 } else {
593 NOTIMPLEMENTED(); 594 NOTIMPLEMENTED();
594 } 595 }
595 596
596 current_screen_ = new_screen; 597 current_screen_ = new_screen;
597 FOR_EACH_OBSERVER(Observer, 598 FOR_EACH_OBSERVER(Observer,
598 observer_list_, 599 observer_list_,
599 OnCurrentScreenChanged(current_screen_, new_screen)); 600 OnCurrentScreenChanged(current_screen_, new_screen));
600 } 601 }
601 602
603 void OobeUI::EnableMdOobe() {
604 md_oobe_enabled_ = true;
605 }
606
602 } // namespace chromeos 607 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698