diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 02:06:05 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 02:06:05 +0000 |
| commit | d0c9fef9a86aae0437f2ef85c5c1f224ef8da9f2 (patch) | |
| tree | 5cb8cb9839455a3509400bd801cdef1c8ddc64ff /ash | |
| parent | 11c55a9d8d534a8d6ae7a4b9d4b87c783d5b90bc (diff) | |
| download | chromium_src-d0c9fef9a86aae0437f2ef85c5c1f224ef8da9f2.zip chromium_src-d0c9fef9a86aae0437f2ef85c5c1f224ef8da9f2.tar.gz chromium_src-d0c9fef9a86aae0437f2ef85c5c1f224ef8da9f2.tar.bz2 | |
Always show brightness control while extended desktop is disabled.
BUG=152003
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=158656
Review URL: https://chromiumcodereview.appspot.com/10990029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158721 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 81f9df4..74cce7b 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -731,13 +731,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 fed2e14..a7f3e19 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(); { |