Make WebUI MD login and lock screen default

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 125 matching lines @@
   source->AddLocalizedStrings(localized_strings);
   source->SetJsonPath(kStringsJSPath);
 
   if (display_type == OobeUI::kOobeDisplay) {
     source->SetDefaultResource(IDR_OOBE_HTML);
     source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS);
     source->AddResourcePath(kCustomElementsHTMLPath,
                             IDR_CUSTOM_ELEMENTS_OOBE_HTML);
     source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_OOBE_JS);
   } else if (display_type == OobeUI::kLockDisplay) {
-    if (command_line->HasSwitch(chromeos::switches::kShowNonViewMdLogin)) {
+    if (command_line->HasSwitch(chromeos::switches::kShowNonMdLogin)) {
+      source->SetDefaultResource(IDR_LOCK_HTML);
+      source->AddResourcePath(kLockJSPath, IDR_LOCK_JS);
+      source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath,
+                              IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML);
+      source->AddResourcePath(kCustomElementsPinKeyboardJSPath,
+                              IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS);
+    } else {
       source->SetDefaultResource(IDR_MD_LOCK_HTML);
       source->AddResourcePath(kLockJSPath, IDR_MD_LOCK_JS);
       source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath,
                               IDR_MD_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML);
       source->AddResourcePath(kCustomElementsPinKeyboardJSPath,
                               IDR_MD_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS);
-    } else {
-      source->SetDefaultResource(IDR_LOCK_HTML);
-      source->AddResourcePath(kLockJSPath, IDR_LOCK_JS);
-      source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath,
-                              IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML);
-      source->AddResourcePath(kCustomElementsPinKeyboardJSPath,
-                              IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS);
     }
     source->AddResourcePath(kCustomElementsHTMLPath,
                             IDR_CUSTOM_ELEMENTS_LOCK_HTML);
     source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_LOCK_JS);
     source->AddResourcePath(kCustomElementsUserPodHTMLPath,
                             IDR_CUSTOM_ELEMENTS_USER_POD_HTML);
   } else {
-    if (command_line->HasSwitch(chromeos::switches::kShowMdLogin) ||
-        command_line->HasSwitch(chromeos::switches::kShowNonViewMdLogin)) {
+    if (command_line->HasSwitch(chromeos::switches::kShowNonMdLogin)) {
+      source->SetDefaultResource(IDR_LOGIN_HTML);
+      source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
+    } else {
       source->SetDefaultResource(IDR_MD_LOGIN_HTML);
       source->AddResourcePath(kLoginJSPath, IDR_MD_LOGIN_JS);
-    } else {
-      source->SetDefaultResource(IDR_LOGIN_HTML);
-      source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
     }
     source->AddResourcePath(kCustomElementsHTMLPath,
                             IDR_CUSTOM_ELEMENTS_LOGIN_HTML);
     source->AddResourcePath(kCustomElementsJSPath,
                             IDR_CUSTOM_ELEMENTS_LOGIN_JS);
     source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath,
                             IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML);
     source->AddResourcePath(kCustomElementsPinKeyboardJSPath,
                             IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS);
     source->AddResourcePath(kCustomElementsUserPodHTMLPath,
@@ skipping 470 matching lines @@
   GetLocalizedStrings(&localized_strings);
   static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
 }
 
 void OobeUI::OnDisplayConfigurationChanged() {
   if (oobe_display_chooser_)
     oobe_display_chooser_->TryToPlaceUiOnTouchDisplay();
 }
 
 }  // namespace chromeos