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

Unified 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, 4 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 0ab0ecb1ba8cea10b3d2067832e113f6701e49e2..7a6fb2b54989c1f5a542bebb4617db9c6150ed6c 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -493,7 +493,8 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
- localized_strings->SetString("newOobeUI", UseMDOobe() ? "on" : "off");
+ localized_strings->SetString(
+ "newOobeUI", (md_oobe_enabled_ && UseMDOobe()) ? "on" : "off");
}
void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
@@ -599,4 +600,8 @@ void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
OnCurrentScreenChanged(current_screen_, new_screen));
}
+void OobeUI::EnableMdOobe() {
+ md_oobe_enabled_ = true;
+}
+
} // namespace chromeos
« 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