| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h
" | 5 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h
" |
| 6 | 6 |
| 7 #include "ash/common/dbus_thread_manager_ash.h" |
| 7 #include "base/metrics/user_metrics.h" | 8 #include "base/metrics/user_metrics.h" |
| 8 #include "chromeos/dbus/dbus_thread_manager.h" | 9 // #include "chromeos/dbus/dbus_thread_manager.h" |
| 9 #include "chromeos/dbus/power_manager_client.h" | 10 #include "chromeos/dbus/power_manager_client.h" |
| 10 #include "ui/base/accelerators/accelerator.h" | 11 #include "ui/base/accelerators/accelerator.h" |
| 11 | 12 |
| 12 namespace ash { | 13 namespace ash { |
| 13 namespace system { | 14 namespace system { |
| 14 | 15 |
| 15 void BrightnessControllerChromeos::HandleBrightnessDown( | 16 void BrightnessControllerChromeos::HandleBrightnessDown( |
| 16 const ui::Accelerator& accelerator) { | 17 const ui::Accelerator& accelerator) { |
| 17 if (accelerator.key_code() == ui::VKEY_BRIGHTNESS_DOWN) | 18 if (accelerator.key_code() == ui::VKEY_BRIGHTNESS_DOWN) |
| 18 base::RecordAction(base::UserMetricsAction("Accel_BrightnessDown_F6")); | 19 base::RecordAction(base::UserMetricsAction("Accel_BrightnessDown_F6")); |
| 19 | 20 |
| 20 chromeos::DBusThreadManager::Get() | 21 DBusThreadManagerAsh::Get() |
| 21 ->GetPowerManagerClient() | 22 ->GetPowerManagerClient() |
| 22 ->DecreaseScreenBrightness(true); | 23 ->DecreaseScreenBrightness(true); |
| 23 } | 24 } |
| 24 | 25 |
| 25 void BrightnessControllerChromeos::HandleBrightnessUp( | 26 void BrightnessControllerChromeos::HandleBrightnessUp( |
| 26 const ui::Accelerator& accelerator) { | 27 const ui::Accelerator& accelerator) { |
| 27 if (accelerator.key_code() == ui::VKEY_BRIGHTNESS_UP) | 28 if (accelerator.key_code() == ui::VKEY_BRIGHTNESS_UP) |
| 28 base::RecordAction(base::UserMetricsAction("Accel_BrightnessUp_F7")); | 29 base::RecordAction(base::UserMetricsAction("Accel_BrightnessUp_F7")); |
| 29 | 30 |
| 30 chromeos::DBusThreadManager::Get() | 31 DBusThreadManagerAsh::Get() |
| 31 ->GetPowerManagerClient() | 32 ->GetPowerManagerClient() |
| 32 ->IncreaseScreenBrightness(); | 33 ->IncreaseScreenBrightness(); |
| 33 } | 34 } |
| 34 | 35 |
| 35 void BrightnessControllerChromeos::SetBrightnessPercent(double percent, | 36 void BrightnessControllerChromeos::SetBrightnessPercent(double percent, |
| 36 bool gradual) { | 37 bool gradual) { |
| 37 chromeos::DBusThreadManager::Get() | 38 DBusThreadManagerAsh::Get() |
| 38 ->GetPowerManagerClient() | 39 ->GetPowerManagerClient() |
| 39 ->SetScreenBrightnessPercent(percent, gradual); | 40 ->SetScreenBrightnessPercent(percent, gradual); |
| 40 } | 41 } |
| 41 | 42 |
| 42 void BrightnessControllerChromeos::GetBrightnessPercent( | 43 void BrightnessControllerChromeos::GetBrightnessPercent( |
| 43 const base::Callback<void(double)>& callback) { | 44 const base::Callback<void(double)>& callback) { |
| 44 chromeos::DBusThreadManager::Get() | 45 DBusThreadManagerAsh::Get() |
| 45 ->GetPowerManagerClient() | 46 ->GetPowerManagerClient() |
| 46 ->GetScreenBrightnessPercent(callback); | 47 ->GetScreenBrightnessPercent(callback); |
| 47 } | 48 } |
| 48 | 49 |
| 49 } // namespace system | 50 } // namespace system |
| 50 } // namespace ash | 51 } // namespace ash |
| OLD | NEW |