diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 23:55:07 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 23:55:07 +0000 |
| commit | 3b11aab3f0b143ef3e67f9028f6e8d388b7e4ca5 (patch) | |
| tree | 2f3a42549403e40fcf32e0479846a2354b4b6831 | |
| parent | 66476eea824774e59f389455b2d245a60ecafa11 (diff) | |
| download | chromium_src-3b11aab3f0b143ef3e67f9028f6e8d388b7e4ca5.zip chromium_src-3b11aab3f0b143ef3e67f9028f6e8d388b7e4ca5.tar.gz chromium_src-3b11aab3f0b143ef3e67f9028f6e8d388b7e4ca5.tar.bz2 | |
Revert r159980 "Use mirror mode if there is external monitor on boot"
TBR=oshima@chromium.org
BUG=153717
TEST=none
Review URL: https://codereview.chromium.org/11044028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160012 0039d316-1c4b-4281-b951-d872f2087c98
| -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 ffb9590..59df646 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: - // Unknown so just request something safe. - state = STATE_DUAL_PRIMARY_ONLY; + // Default to mirror mode for m23. + state = STATE_DUAL_MIRROR; } break; } |