Consolidate volume control code.

ash/accelerators/accelerator_controller_unittest.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 "ash/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness/brightness_control_delegate.h"
 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/event.h"
 
@@ skipping 112 matching lines @@
     last_accelerator_ = accelerator;
     return consume_;
   }
   virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE {
     ++handle_volume_up_count_;
     last_accelerator_ = accelerator;
     return consume_;
   }
   virtual void SetVolumePercent(double percent) OVERRIDE {
   }
+  virtual bool IsAudioMuted() const OVERRIDE {
+    return false;
+  }
+  virtual void SetAudioMuted(bool muted) OVERRIDE {
+  }
+  virtual float GetVolumeLevel() const OVERRIDE {
+    return 0.0;
+  }
+  virtual void SetVolumeLevel(float level) OVERRIDE {
+  }
 
   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_;
   }
@@ skipping 452 matching lines @@
     EXPECT_EQ(0, delegate->handle_caps_lock_count());
     EXPECT_TRUE(GetController()->Process(
         ui::Accelerator(ui::VKEY_LWIN, ui::EF_SHIFT_DOWN)));
     EXPECT_EQ(1, delegate->handle_caps_lock_count());
   }
   // Volume
   const ui::Accelerator f8(ui::VKEY_F8, ui::EF_NONE);
   const ui::Accelerator f9(ui::VKEY_F9, ui::EF_NONE);
   const ui::Accelerator f10(ui::VKEY_F10, ui::EF_NONE);
   {
-    EXPECT_FALSE(GetController()->Process(f8));
-    EXPECT_FALSE(GetController()->Process(f9));
-    EXPECT_FALSE(GetController()->Process(f10));
+    EXPECT_TRUE(GetController()->Process(f8));
+    EXPECT_TRUE(GetController()->Process(f9));
+    EXPECT_TRUE(GetController()->Process(f10));
     DummyVolumeControlDelegate* delegate =
         new DummyVolumeControlDelegate(false);
-    GetController()->SetVolumeControlDelegate(
+    ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
     EXPECT_FALSE(GetController()->Process(f8));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(f8, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
     EXPECT_FALSE(GetController()->Process(f9));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(f9, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_FALSE(GetController()->Process(f10));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(f10, delegate->last_accelerator());
   }
   {
     DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true);
-    GetController()->SetVolumeControlDelegate(
+    ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
     EXPECT_TRUE(GetController()->Process(f8));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(f8, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
     EXPECT_TRUE(GetController()->Process(f9));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(f9, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(GetController()->Process(f10));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(f10, delegate->last_accelerator());
   }
   const ui::Accelerator volume_mute(ui::VKEY_VOLUME_MUTE, ui::EF_NONE);
   const ui::Accelerator volume_down(ui::VKEY_VOLUME_DOWN, ui::EF_NONE);
   const ui::Accelerator volume_up(ui::VKEY_VOLUME_UP, ui::EF_NONE);
   {
     DummyVolumeControlDelegate* delegate =
         new DummyVolumeControlDelegate(false);
-    GetController()->SetVolumeControlDelegate(
+    ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
     EXPECT_FALSE(GetController()->Process(volume_mute));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(volume_mute, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
     EXPECT_FALSE(GetController()->Process(volume_down));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_FALSE(GetController()->Process(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
   {
     DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true);
-    GetController()->SetVolumeControlDelegate(
+    ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate(
         scoped_ptr<VolumeControlDelegate>(delegate).Pass());
     EXPECT_EQ(0, delegate->handle_volume_mute_count());
     EXPECT_TRUE(GetController()->Process(volume_mute));
     EXPECT_EQ(1, delegate->handle_volume_mute_count());
     EXPECT_EQ(volume_mute, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
     EXPECT_TRUE(GetController()->Process(volume_down));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
@@ skipping 289 matching lines @@
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE)));
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_A, ui::EF_NONE)));
 }
 
 }  // namespace test
 }  // namespace ash