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 42b74133b72014dc8668318d57ea372e3d80a5f5..f9043f0f8f512ebe2e8a580ee901dcdfcdf3aa07 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
@@ -143,20 +143,20 @@ content::WebUIDataSource* CreateOobeUIDataSource( |
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)) { |
- 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 { |
+ 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); |
} |
source->AddResourcePath(kCustomElementsHTMLPath, |
IDR_CUSTOM_ELEMENTS_LOCK_HTML); |
@@ -164,13 +164,12 @@ content::WebUIDataSource* CreateOobeUIDataSource( |
source->AddResourcePath(kCustomElementsUserPodHTMLPath, |
IDR_CUSTOM_ELEMENTS_USER_POD_HTML); |
} else { |
- if (command_line->HasSwitch(chromeos::switches::kShowMdLogin) || |
- command_line->HasSwitch(chromeos::switches::kShowNonViewMdLogin)) { |
- source->SetDefaultResource(IDR_MD_LOGIN_HTML); |
- source->AddResourcePath(kLoginJSPath, IDR_MD_LOGIN_JS); |
- } else { |
+ 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); |
} |
source->AddResourcePath(kCustomElementsHTMLPath, |
IDR_CUSTOM_ELEMENTS_LOGIN_HTML); |