diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 22:15:08 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 22:15:08 +0000 |
| commit | 4e1a72249959f7ac58da885b59b3e460ac108009 (patch) | |
| tree | 18fe1d485844401e3eeed06e779650c968d8454d /ash/accelerators/accelerator_controller.cc | |
| parent | b4e0d842ac5f2b2c2193083d09f417207ed94058 (diff) | |
| download | chromium_src-4e1a72249959f7ac58da885b59b3e460ac108009.zip chromium_src-4e1a72249959f7ac58da885b59b3e460ac108009.tar.gz chromium_src-4e1a72249959f7ac58da885b59b3e460ac108009.tar.bz2 | |
Revert 158656 "Always show brightness control while extended desktop is disabled."
TBR=oshima@chromium.org
BUG=152003
TEST=none
Review URL: https://codereview.chromium.org/10978035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 74cce7b..81f9df4 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -731,9 +731,13 @@ bool AcceleratorController::PerformAction(int action, void AcceleratorController::SetBrightnessControlDelegate( scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) { - // TODO(oshima): Show brightness control regardless of display type - // temporarily. crbug.com/152003. - brightness_control_delegate_.swap(brightness_control_delegate); + internal::MultiDisplayManager* display_manager = + static_cast<internal::MultiDisplayManager*>( + aura::Env::GetInstance()->display_manager()); + // Install brightness control delegate only when internal + // display exists. + if (display_manager->HasInternalDisplay()) + brightness_control_delegate_.swap(brightness_control_delegate); } void AcceleratorController::SetImeControlDelegate( |