| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 8c78bce1323821acb9ed4989c971e83404be29f6..7be06f07069cd4f3dd693dc3ac07f8d5028efa1a 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -222,25 +222,7 @@ bool ShouldAutoLaunchKioskApp(const CommandLine& command_line) {
|
| void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
|
| Profile* profile) {
|
| if (parsed_command_line.HasSwitch(switches::kLoginManager)) {
|
| - std::string first_screen =
|
| - parsed_command_line.GetSwitchValueASCII(switches::kLoginScreen);
|
| - std::string size_arg =
|
| - parsed_command_line.GetSwitchValueASCII(switches::kLoginScreenSize);
|
| - gfx::Size size(0, 0);
|
| - // Allow the size of the login window to be set explicitly. If not set,
|
| - // default to the entire screen. This is mostly useful for testing.
|
| - if (size_arg.size()) {
|
| - std::vector<std::string> dimensions;
|
| - base::SplitString(size_arg, ',', &dimensions);
|
| - if (dimensions.size() == 2) {
|
| - int width, height;
|
| - if (base::StringToInt(dimensions[0], &width) &&
|
| - base::StringToInt(dimensions[1], &height))
|
| - size.SetSize(width, height);
|
| - }
|
| - }
|
| -
|
| - ShowLoginWizard(first_screen, size);
|
| + ShowLoginWizard(std::string());
|
|
|
| if (KioskModeSettings::Get()->IsKioskModeEnabled())
|
| InitializeKioskModeScreensaver();
|
|
|