Consolidate volume control code.

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 481 matching lines @@
       if (keyboard_brightness_control_delegate_.get())
         return keyboard_brightness_control_delegate_->
             HandleKeyboardBrightnessDown(accelerator);
       break;
     case KEYBOARD_BRIGHTNESS_UP:
       if (keyboard_brightness_control_delegate_.get())
         return keyboard_brightness_control_delegate_->
             HandleKeyboardBrightnessUp(accelerator);
       break;
     case VOLUME_MUTE:
-      if (volume_control_delegate_.get())
-        return volume_control_delegate_->HandleVolumeMute(accelerator);
+      return shell->tray_delegate()->volume_control_delegate()->
+          HandleVolumeMute(accelerator);
       break;
     case VOLUME_DOWN:
-      if (volume_control_delegate_.get())
-        return volume_control_delegate_->HandleVolumeDown(accelerator);
+      return shell->tray_delegate()->volume_control_delegate()->
+          HandleVolumeDown(accelerator);
       break;
     case VOLUME_UP:
-      if (volume_control_delegate_.get())
-        return volume_control_delegate_->HandleVolumeUp(accelerator);
+      return shell->tray_delegate()->volume_control_delegate()->
+          HandleVolumeUp(accelerator);
       break;
     case FOCUS_LAUNCHER:
       if (shell->launcher())
         return shell->focus_cycler()->FocusWidget(shell->launcher()->widget());
       break;
     case FOCUS_NEXT_PANE:
       return HandleRotatePaneFocus(Shell::FORWARD);
     case FOCUS_PREVIOUS_PANE:
       return HandleRotatePaneFocus(Shell::BACKWARD);
     case FOCUS_SYSTEM_TRAY:
@@ skipping 170 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_.swap(
       keyboard_brightness_control_delegate);
 }
 
 void AcceleratorController::SetScreenshotDelegate(
     scoped_ptr<ScreenshotDelegate> screenshot_delegate) {
   screenshot_delegate_.swap(screenshot_delegate);
 }
 
-void AcceleratorController::SetVolumeControlDelegate(
-    scoped_ptr<VolumeControlDelegate> volume_control_delegate) {
-  volume_control_delegate_.swap(volume_control_delegate);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, ui::AcceleratorTarget implementation:
 
 bool AcceleratorController::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   std::map<ui::Accelerator, int>::const_iterator it =
       accelerators_.find(accelerator);
   DCHECK(it != accelerators_.end());
   return PerformAction(static_cast<AcceleratorAction>(it->second), accelerator);
 }
@@ skipping 39 matching lines @@
     accelerators_.insert(
         std::make_pair(accelerator, accelerators[i].action));
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash