diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 20:48:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 20:48:39 +0000 |
| commit | 5378d79012fc21aad9df86c7502f0b8cf4daf8f3 (patch) | |
| tree | 8b9eccd48cbebb7411844ca4d35ef8a5a1520165 /ash | |
| parent | 4fc24b6fc8a2f232edd5b05d16d5985e298f5bdc (diff) | |
| download | chromium_src-5378d79012fc21aad9df86c7502f0b8cf4daf8f3.zip chromium_src-5378d79012fc21aad9df86c7502f0b8cf4daf8f3.tar.gz chromium_src-5378d79012fc21aad9df86c7502f0b8cf4daf8f3.tar.bz2 | |
Don't try to switch display mode if there is no external display
Switch to Dual Display in Login screen.
BUG=145844,145158
Review URL: https://chromiumcodereview.appspot.com/10899024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 3c3c5c6..0f72f08 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -441,12 +441,15 @@ bool AcceleratorController::PerformAction(int action, Shell::GetInstance()->tray_delegate()->ToggleWifi(); return true; case CYCLE_DISPLAY_MODE: { - internal::OutputConfiguratorAnimation* animation = - Shell::GetInstance()->output_configurator_animation(); - animation->StartFadeOutAnimation(base::Bind( - base::IgnoreResult(&chromeos::OutputConfigurator::CycleDisplayMode), - base::Unretained(Shell::GetInstance()->output_configurator()))); - return true; + Shell* shell = Shell::GetInstance(); + if (shell->output_configurator()->connected_output_count() > 1) { + internal::OutputConfiguratorAnimation* animation = + shell->output_configurator_animation(); + animation->StartFadeOutAnimation(base::Bind( + base::IgnoreResult(&chromeos::OutputConfigurator::CycleDisplayMode), + base::Unretained(shell->output_configurator()))); + return true; + } } #endif case OPEN_FEEDBACK_PAGE: |