diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 18:10:03 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 18:10:03 +0000 |
| commit | 3c21c833047b14ee1d033568bec9823ec1e43e4c (patch) | |
| tree | a87ca9252d53937630de0bbfce9435ba303277a0 /ash | |
| parent | 94011294d49023ea9b64c6267bc4df1b7ba5bd33 (diff) | |
| download | chromium_src-3c21c833047b14ee1d033568bec9823ec1e43e4c.zip chromium_src-3c21c833047b14ee1d033568bec9823ec1e43e4c.tar.gz chromium_src-3c21c833047b14ee1d033568bec9823ec1e43e4c.tar.bz2 | |
Merge 159105 - This is the 3 following CLs collapsed as one (for easier merge in M23)
http://src.chromium.org/viewvc/chrome?view=rev&revision=158546
http://src.chromium.org/viewvc/chrome?view=rev&revision=158721
http://src.chromium.org/viewvc/chrome?view=rev&revision=158771
NOTE: this can only be landed *after* this has landed: https://codereview.chromium.org/10990091/
BUG=152003
TBR=oshima@chromium.org,derat@chromium.org,sky@chromium.org,jhorwich@chromium.org
Review URL: https://codereview.chromium.org/10993062
TBR=saintlou@chromium.org
Review URL: https://codereview.chromium.org/10993085
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@159296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 10 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 7c43344..93ae641 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -719,13 +719,9 @@ bool AcceleratorController::PerformAction(int action, void AcceleratorController::SetBrightnessControlDelegate( scoped_ptr<BrightnessControlDelegate> 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); + // TODO(oshima): Show brightness control regardless of display type + // temporarily. crbug.com/152003. + brightness_control_delegate_.swap(brightness_control_delegate); } void AcceleratorController::SetImeControlDelegate( diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 601389e..9f96207 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -713,16 +713,9 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { // Brightness const ui::Accelerator f6(ui::VKEY_F6, ui::EF_NONE); const ui::Accelerator f7(ui::VKEY_F7, ui::EF_NONE); - { - EXPECT_FALSE(GetController()->Process(f6)); - EXPECT_FALSE(GetController()->Process(f7)); - DummyBrightnessControlDelegate* delegate = - new DummyBrightnessControlDelegate(true); - GetController()->SetBrightnessControlDelegate( - scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); - EXPECT_FALSE(GetController()->Process(f6)); - EXPECT_FALSE(GetController()->Process(f7)); - } + // TODO(oshima): Temporarily removed the tests for + // no internal display case. Add this back when + // re-enabling extended desktop. crbug.com/152003 // Enable internal display. EnableInternalDisplay(); { |