| Index: ash/wm/system_gesture_event_filter.cc
|
| diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
|
| index 3d79937af0017d2f7ade649a82284023ed5e6a1b..36be556d4c5624f164ad65f9795bc198a6d90b96 100644
|
| --- a/ash/wm/system_gesture_event_filter.cc
|
| +++ b/ash/wm/system_gesture_event_filter.cc
|
| @@ -13,6 +13,7 @@
|
| #include "ash/shell_delegate.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/system/brightness/brightness_control_delegate.h"
|
| +#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/volume_control_delegate.h"
|
| #include "ash/wm/property_util.h"
|
| #include "ash/wm/window_animations.h"
|
| @@ -692,10 +693,8 @@ bool SystemGestureEventFilter::HandleDeviceControl(
|
| if (delegate)
|
| delegate->SetBrightnessPercent(100.0 - percent, true);
|
| } else if (start_location_ == BEZEL_START_RIGHT) {
|
| - ash::VolumeControlDelegate* delegate =
|
| - accelerator->volume_control_delegate();
|
| - if (delegate)
|
| - delegate->SetVolumePercent(100.0 - percent);
|
| + Shell::GetInstance()->tray_delegate()->GetVolumeControlDelegate()->
|
| + SetVolumePercent(100.0 - percent);
|
| } else {
|
| return true;
|
| }
|
|
|