diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 09:54:29 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 09:54:29 +0000 |
| commit | 945f9cae941c94f4043595454aced2cb31cbeda8 (patch) | |
| tree | 2edec774917a7b8820c5e711babcda020bf2d1a8 /ash/accelerators/accelerator_controller_unittest.cc | |
| parent | eb10ce48efc10df2f0eeb5e26b14bf3120ea90fc (diff) | |
| download | chromium_src-945f9cae941c94f4043595454aced2cb31cbeda8.zip chromium_src-945f9cae941c94f4043595454aced2cb31cbeda8.tar.gz chromium_src-945f9cae941c94f4043595454aced2cb31cbeda8.tar.bz2 | |
[Cleanup] rename tray_delegate -> system_tray_delegate
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11476034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller_unittest.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 2111d8b..d75d75d 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -723,7 +723,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { { DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(false); - ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( + ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate( scoped_ptr<VolumeControlDelegate>(delegate).Pass()); EXPECT_EQ(0, delegate->handle_volume_mute_count()); EXPECT_FALSE(ProcessWithContext(volume_mute)); @@ -740,7 +740,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { } { DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true); - ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( + ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate( scoped_ptr<VolumeControlDelegate>(delegate).Pass()); EXPECT_EQ(0, delegate->handle_volume_mute_count()); EXPECT_TRUE(ProcessWithContext(volume_mute)); @@ -1247,7 +1247,7 @@ TEST_F(AcceleratorControllerTest, DisallowedAtModalWindow) { EXPECT_TRUE(ProcessWithContext(volume_up)); DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(false); - ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( + ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate( scoped_ptr<VolumeControlDelegate>(delegate).Pass()); EXPECT_EQ(0, delegate->handle_volume_mute_count()); EXPECT_FALSE(ProcessWithContext(volume_mute)); @@ -1264,7 +1264,7 @@ TEST_F(AcceleratorControllerTest, DisallowedAtModalWindow) { } { DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true); - ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( + ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate( scoped_ptr<VolumeControlDelegate>(delegate).Pass()); EXPECT_EQ(0, delegate->handle_volume_mute_count()); EXPECT_TRUE(ProcessWithContext(volume_mute)); |