diff options
| -rw-r--r-- | chrome/browser/chromeos/chrome_browser_main_chromeos.cc | 6 | ||||
| -rw-r--r-- | chromeos/display/output_configurator.cc | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 247df49..8cd05a3 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -161,6 +161,12 @@ class StubLogin : public chromeos::LoginStatusConsumer, void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line, Profile* profile) { + // Login should always use dual display if there is an external display. + chromeos::OutputConfigurator* output_configurator = + ash::Shell::GetInstance()->output_configurator(); + if (output_configurator->connected_output_count() > 1) + output_configurator->SetDisplayMode(chromeos::STATE_DUAL_PRIMARY_ONLY); + if (parsed_command_line.HasSwitch(switches::kLoginManager)) { std::string first_screen = parsed_command_line.GetSwitchValueASCII(switches::kLoginScreen); diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc index 59df646..ffb9590 100644 --- a/chromeos/display/output_configurator.cc +++ b/chromeos/display/output_configurator.cc @@ -382,8 +382,8 @@ static OutputState GetNextState(Display* display, state = STATE_DUAL_PRIMARY_ONLY; break; default: - // Default to mirror mode for m23. - state = STATE_DUAL_MIRROR; + // Unknown so just request something safe. + state = STATE_DUAL_PRIMARY_ONLY; } break; } |