Consolidate volume control code.

chrome/browser/ui/ash/ash_init.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 "chrome/browser/ui/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ skipping 11 matching lines @@
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/compositor_setup.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/browser/ui/ash/brightness_controller_chromeos.h"
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 #include "chrome/browser/ui/ash/keyboard_brightness_controller_chromeos.h"
 #endif
 
 
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
 #if defined(OS_CHROMEOS)
@@ skipping 37 matching lines @@
           new BrightnessController).Pass());
   chromeos::input_method::XKeyboard* xkeyboard =
       chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard();
   shell->accelerator_controller()->SetCapsLockDelegate(
       scoped_ptr<ash::CapsLockDelegate>(new CapsLockHandler(xkeyboard)).Pass());
   shell->accelerator_controller()->SetImeControlDelegate(
       scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass());
   shell->accelerator_controller()->SetKeyboardBrightnessControlDelegate(
       scoped_ptr<ash::KeyboardBrightnessControlDelegate>(
           new KeyboardBrightnessController).Pass());
-  shell->accelerator_controller()->SetVolumeControlDelegate(
-      scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass());
-
   ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(
       chromeos::accessibility::IsHighContrastEnabled());
 
   ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
       chromeos::accessibility::IsScreenMagnifierEnabled());
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableZeroBrowsersOpenForTests)) {
     browser::StartKeepAlive();
   }
 #endif
   ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();
 }
 
 void CloseAsh() {
   if (ash::Shell::GetInstance())
     ash::Shell::DeleteInstance();
 }
 
 }  // namespace chrome