Index: ash/accelerators/accelerator_controller_unittest.cc |
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc |
index 93277eafc08add99af78300ed01b1180649b3470..8ff103a139cad8de1a274ad960bf748c6c5ae08e 100644 |
--- a/ash/accelerators/accelerator_controller_unittest.cc |
+++ b/ash/accelerators/accelerator_controller_unittest.cc |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include "ash/accelerators/accelerator_controller.h" |
+ |
#include "ash/accelerators/accelerator_table.h" |
#include "ash/accessibility_delegate.h" |
#include "ash/ash_switches.h" |
@@ -16,6 +17,7 @@ |
#include "ash/system/tray/system_tray_delegate.h" |
#include "ash/test/ash_test_base.h" |
#include "ash/test/display_manager_test_api.h" |
+#include "ash/test/dummy_volume_control_delegate.h" |
#include "ash/test/test_screenshot_delegate.h" |
#include "ash/test/test_shell_delegate.h" |
#include "ash/volume_control_delegate.h" |
@@ -69,55 +71,6 @@ class ReleaseAccelerator : public ui::Accelerator { |
} |
}; |
-class DummyVolumeControlDelegate : public VolumeControlDelegate { |
- public: |
- explicit DummyVolumeControlDelegate(bool consume) |
- : consume_(consume), |
- handle_volume_mute_count_(0), |
- handle_volume_down_count_(0), |
- handle_volume_up_count_(0) { |
- } |
- virtual ~DummyVolumeControlDelegate() {} |
- |
- virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE { |
- ++handle_volume_mute_count_; |
- last_accelerator_ = accelerator; |
- return consume_; |
- } |
- virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE { |
- ++handle_volume_down_count_; |
- last_accelerator_ = accelerator; |
- return consume_; |
- } |
- virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE { |
- ++handle_volume_up_count_; |
- last_accelerator_ = accelerator; |
- return consume_; |
- } |
- |
- int handle_volume_mute_count() const { |
- return handle_volume_mute_count_; |
- } |
- int handle_volume_down_count() const { |
- return handle_volume_down_count_; |
- } |
- int handle_volume_up_count() const { |
- return handle_volume_up_count_; |
- } |
- const ui::Accelerator& last_accelerator() const { |
- return last_accelerator_; |
- } |
- |
- private: |
- const bool consume_; |
- int handle_volume_mute_count_; |
- int handle_volume_down_count_; |
- int handle_volume_up_count_; |
- ui::Accelerator last_accelerator_; |
- |
- DISALLOW_COPY_AND_ASSIGN(DummyVolumeControlDelegate); |
-}; |
- |
class DummyBrightnessControlDelegate : public BrightnessControlDelegate { |
public: |
explicit DummyBrightnessControlDelegate(bool consume) |