[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

30 files changed, 105 insertions, 99 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index b55e0b6..e68f545 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -493,7 +493,7 @@ bool AcceleratorController::PerformAction(int action,
     case TOGGLE_SPOKEN_FEEDBACK:
       return HandleToggleSpokenFeedback();
     case TOGGLE_WIFI:
-      Shell::GetInstance()->tray_delegate()->ToggleWifi();
+      Shell::GetInstance()->system_tray_delegate()->ToggleWifi();
       return true;
     case DISABLE_GPU_WATCHDOG:
       content::GpuDataManager::GetInstance()->DisableGpuWatchdog();
@@ -602,15 +602,15 @@ bool AcceleratorController::PerformAction(int action,
             HandleKeyboardBrightnessUp(accelerator);
       break;
     case VOLUME_MUTE:
-      return shell->tray_delegate()->GetVolumeControlDelegate()->
+      return shell->system_tray_delegate()->GetVolumeControlDelegate()->
           HandleVolumeMute(accelerator);
       break;
     case VOLUME_DOWN:
-      return shell->tray_delegate()->GetVolumeControlDelegate()->
+      return shell->system_tray_delegate()->GetVolumeControlDelegate()->
           HandleVolumeDown(accelerator);
       break;
     case VOLUME_UP:
-      return shell->tray_delegate()->GetVolumeControlDelegate()->
+      return shell->system_tray_delegate()->GetVolumeControlDelegate()->
           HandleVolumeUp(accelerator);
       break;
     case FOCUS_LAUNCHER:
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));
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index e3ca185..b1ea646 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -230,8 +230,8 @@ RootWindowController::GetSystemModalLayoutManager(aura::Window* window) {
       container = GetContainer(kShellWindowId_SystemModalContainer);
     }
   } else {
-    user::LoginStatus login = Shell::GetInstance()->tray_delegate() ?
-        Shell::GetInstance()->tray_delegate()->GetUserLoginStatus() :
+    user::LoginStatus login = Shell::GetInstance()->system_tray_delegate() ?
+        Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() :
         user::LOGGED_IN_NONE;
     int modal_window_id = (login == user::LOGGED_IN_LOCKED ||
                            login == user::LOGGED_IN_NONE) ?
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 24ae5de..9de5b8c 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -236,7 +236,7 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
   internal::RootWindowController* controller =
       shell->GetPrimaryRootWindowController();
   EXPECT_EQ(user::LOGGED_IN_USER,
-            shell->tray_delegate()->GetUserLoginStatus());
+            shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
       internal::kShellWindowId_SystemModalContainer)->layout_manager(),
           controller->GetSystemModalLayoutManager(NULL));
@@ -250,7 +250,7 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
 
   shell->delegate()->LockScreen();
   EXPECT_EQ(user::LOGGED_IN_LOCKED,
-            shell->tray_delegate()->GetUserLoginStatus());
+            shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
       internal::kShellWindowId_LockSystemModalContainer)->layout_manager(),
           controller->GetSystemModalLayoutManager(NULL));
@@ -279,7 +279,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   // Configure login screen environment.
   SetUserLoggedIn(false);
   EXPECT_EQ(user::LOGGED_IN_NONE,
-            shell->tray_delegate()->GetUserLoginStatus());
+            shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_FALSE(shell->delegate()->IsUserLoggedIn());
   EXPECT_FALSE(shell->delegate()->IsSessionStarted());
 
@@ -304,7 +304,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   SetUserLoggedIn(true);
   SetSessionStarted(true);
   EXPECT_EQ(user::LOGGED_IN_USER,
-            shell->tray_delegate()->GetUserLoginStatus());
+            shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_TRUE(shell->delegate()->IsUserLoggedIn());
   EXPECT_TRUE(shell->delegate()->IsSessionStarted());
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
diff --git a/ash/shell.h b/ash/shell.h
index 0a1fe5f..b63010b 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -373,8 +373,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
   // Returns the launcher delegate, creating if necesary.
   LauncherDelegate* GetLauncherDelegate();
 
-  // TODO(stevenjb): Rename to system_tray_delegate().
-  SystemTrayDelegate* tray_delegate() {
+  SystemTrayDelegate* system_tray_delegate() {
     return system_tray_delegate_.get();
   }
 
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc
index 672ddeb..fd865d7 100644
--- a/ash/system/audio/tray_volume.cc
+++ b/ash/system/audio/tray_volume.cc
@@ -44,12 +44,12 @@ const int kVolumeImageHeight = 25;
 const int kVolumeLevels = 4;
 
 bool IsAudioMuted() {
-  return Shell::GetInstance()->tray_delegate()->
+  return Shell::GetInstance()->system_tray_delegate()->
       GetVolumeControlDelegate()->IsAudioMuted();
 }
 
 float GetVolumeLevel() {
-  return Shell::GetInstance()->tray_delegate()->
+  return Shell::GetInstance()->system_tray_delegate()->
       GetVolumeControlDelegate()->GetVolumeLevel();
 }
 
@@ -189,7 +189,7 @@ class VolumeView : public views::View,
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
     CHECK(sender == icon_ || sender == mute_);
-    ash::Shell::GetInstance()->tray_delegate()->
+    ash::Shell::GetInstance()->system_tray_delegate()->
         GetVolumeControlDelegate()->SetAudioMuted(!IsAudioMuted());
   }
 
@@ -199,7 +199,7 @@ class VolumeView : public views::View,
                                   float old_value,
                                   views::SliderChangeReason reason) OVERRIDE {
     if (reason == views::VALUE_CHANGED_BY_USER) {
-      ash::Shell::GetInstance()->tray_delegate()->
+      ash::Shell::GetInstance()->system_tray_delegate()->
           GetVolumeControlDelegate()->SetVolumeLevel(value);
     }
     icon_->Update();
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index f61af58..3d5d029 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -43,7 +43,7 @@ class BluetoothDefaultView : public TrayItemMore {
 
   void UpdateLabel() {
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     if (delegate->GetBluetoothAvailable()) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       const string16 label =
@@ -97,7 +97,8 @@ class BluetoothDetailedView : public TrayDetailsView,
     connected_devices_.clear();
     paired_not_connected_devices_.clear();
     BluetoothDeviceList list;
-    Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
+    Shell::GetInstance()->system_tray_delegate()->
+        GetAvailableBluetoothDevices(&list);
     for (size_t i = 0; i < list.size(); ++i) {
       if (list[i].connected)
         connected_devices_.push_back(list[i]);
@@ -114,7 +115,7 @@ class BluetoothDetailedView : public TrayDetailsView,
 
     // Do not allow toggling bluetooth in the lock screen.
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     toggle_bluetooth_ = new TrayPopupHeaderButton(this,
         IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
         IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
@@ -134,7 +135,7 @@ class BluetoothDetailedView : public TrayDetailsView,
     CreateScrollableList();
 
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     bool bluetooth_enabled = delegate->GetBluetoothEnabled();
     if (delegate->GetBluetoothAvailable() && !bluetooth_enabled) {
       enable_bluetooth_ =
@@ -152,7 +153,7 @@ class BluetoothDetailedView : public TrayDetailsView,
     if (connected_devices_.size() == 0 &&
         paired_not_connected_devices_.size() == 0) {
       ash::SystemTrayDelegate* delegate =
-          ash::Shell::GetInstance()->tray_delegate();
+          ash::Shell::GetInstance()->system_tray_delegate();
       int message_id;
       if (delegate->GetBluetoothAvailable() &&
           delegate->GetBluetoothEnabled()) {
@@ -200,7 +201,7 @@ class BluetoothDetailedView : public TrayDetailsView,
       return;
 
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     HoverHighlightView* container = new HoverHighlightView(this);
     container->set_fixed_height(kTrayPopupItemHeight);
@@ -215,7 +216,7 @@ class BluetoothDetailedView : public TrayDetailsView,
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == footer()->content()) {
       owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == add_device_) {
@@ -238,7 +239,7 @@ class BluetoothDetailedView : public TrayDetailsView,
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == toggle_bluetooth_)
       delegate->ToggleBluetooth();
     else
@@ -281,7 +282,7 @@ views::View* TrayBluetooth::CreateDefaultView(user::LoginStatus status) {
 }
 
 views::View* TrayBluetooth::CreateDetailedView(user::LoginStatus status) {
-  if (!Shell::GetInstance()->tray_delegate()->GetBluetoothAvailable())
+  if (!Shell::GetInstance()->system_tray_delegate()->GetBluetoothAvailable())
     return NULL;
   CHECK(detailed_ == NULL);
   detailed_ = new tray::BluetoothDetailedView(this, status);
diff --git a/ash/system/chromeos/network/network_list_detailed_view_base.cc b/ash/system/chromeos/network/network_list_detailed_view_base.cc
index 3a8c087..decb77c 100644
--- a/ash/system/chromeos/network/network_list_detailed_view_base.cc
+++ b/ash/system/chromeos/network/network_list_detailed_view_base.cc
@@ -102,7 +102,7 @@ NetworkListDetailedViewBase::~NetworkListDetailedViewBase() {
 void NetworkListDetailedViewBase::Init() {
   CreateItems();
   Update();
-  Shell::GetInstance()->tray_delegate()->RequestNetworkScan();
+  Shell::GetInstance()->system_tray_delegate()->RequestNetworkScan();
 }
 
 NetworkDetailedView::DetailedViewType
@@ -187,7 +187,7 @@ void NetworkListDetailedViewBase::AppendInfoButtonToHeader() {
 void NetworkListDetailedViewBase::UpdateSettingButton() {
   if (proxy_settings_) {
     proxy_settings_->SetEnabled(
-        Shell::GetInstance()->tray_delegate()->IsNetworkConnected());
+        Shell::GetInstance()->system_tray_delegate()->IsNetworkConnected());
   }
 }
 
@@ -301,7 +301,7 @@ void NetworkListDetailedViewBase::ButtonPressed(views::Button* sender,
   // on.
   ResetInfoBubble();
   ash::SystemTrayDelegate* delegate =
-      ash::Shell::GetInstance()->tray_delegate();
+      ash::Shell::GetInstance()->system_tray_delegate();
   if (sender == settings_)
     delegate->ShowNetworkSettings();
   else if (sender == proxy_settings_)
@@ -312,7 +312,7 @@ void NetworkListDetailedViewBase::ButtonPressed(views::Button* sender,
 
 void NetworkListDetailedViewBase::ClickedOn(views::View* sender) {
   ash::SystemTrayDelegate* delegate =
-      ash::Shell::GetInstance()->tray_delegate();
+      ash::Shell::GetInstance()->system_tray_delegate();
   // If the info bubble was visible, close it when some other item is clicked
   // on.
   ResetInfoBubble();
@@ -352,7 +352,7 @@ void NetworkListDetailedViewBase::CreateSettingsEntry() {
 views::View* NetworkListDetailedViewBase::CreateNetworkInfoView() {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   std::string ip_address, ethernet_address, wifi_address;
-  Shell::GetInstance()->tray_delegate()->GetNetworkAddresses(
+  Shell::GetInstance()->system_tray_delegate()->GetNetworkAddresses(
       &ip_address, &ethernet_address, &wifi_address);
 
   views::View* container = new views::View;
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index b28f72e..65f489f 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -186,7 +186,7 @@ void NetworkStateListDetailedView::ButtonPressed(views::Button* sender,
 
   chromeos::NetworkStateHandler* handler = chromeos::NetworkStateHandler::Get();
   ash::SystemTrayDelegate* delegate =
-      ash::Shell::GetInstance()->tray_delegate();
+      ash::Shell::GetInstance()->system_tray_delegate();
   if (sender == button_wifi_) {
     bool enabled = handler->TechnologyEnabled(flimflam::kTypeWifi);
     handler->SetTechnologyEnabled(
@@ -228,7 +228,7 @@ void NetworkStateListDetailedView::ClickedOn(views::View* sender) {
     return;
 
   ash::SystemTrayDelegate* delegate =
-      ash::Shell::GetInstance()->tray_delegate();
+      ash::Shell::GetInstance()->system_tray_delegate();
   if (sender == view_mobile_account_) {
     delegate->ShowCellularURL(topup_url_);
   } else if (sender == setup_mobile_account_) {
@@ -475,7 +475,7 @@ void NetworkStateListDetailedView::UpdateNetworkEntries() {
 
   // TODO(stevenjb): Migrate this code to src/chromeos.
   std::string carrier_id, topup_url, setup_url;
-  if (Shell::GetInstance()->tray_delegate()->
+  if (Shell::GetInstance()->system_tray_delegate()->
       GetCellularCarrierInfo(&carrier_id, &topup_url, &setup_url)) {
     if (carrier_id != carrier_id_) {
       carrier_id_ = carrier_id;
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 663fd2d..ba4b833 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -103,7 +103,7 @@ class NetworkTrayView : public TrayItemView {
     AddChildView(image_view_);
 
     NetworkIconInfo info;
-    Shell::GetInstance()->tray_delegate()->
+    Shell::GetInstance()->system_tray_delegate()->
         GetMostRelevantNetworkIcon(&info, false);
     Update(info);
   }
@@ -158,7 +158,7 @@ class NetworkDefaultView : public TrayItemMore {
 
   void Update() {
     NetworkIconInfo info;
-    Shell::GetInstance()->tray_delegate()->
+    Shell::GetInstance()->system_tray_delegate()->
         GetMostRelevantNetworkIcon(&info, true);
     SetImage(&info.image);
     SetLabel(info.description);
@@ -219,7 +219,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
   }
 
   virtual void UpdateHeaderButtons() OVERRIDE {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     button_wifi_->SetToggled(!delegate->GetWifiEnabled());
     button_mobile_->SetToggled(!delegate->GetMobileEnabled());
     button_mobile_->SetVisible(delegate->GetMobileAvailable());
@@ -248,7 +248,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
 
   virtual void GetAvailableNetworkList(
       std::vector<NetworkIconInfo>* list) OVERRIDE {
-    Shell::GetInstance()->tray_delegate()->GetAvailableNetworks(list);
+    Shell::GetInstance()->system_tray_delegate()->GetAvailableNetworks(list);
   }
 
   virtual void RefreshNetworkScrollWithEmptyNetworkList() OVERRIDE {
@@ -256,9 +256,9 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
     HoverHighlightView* container = new HoverHighlightView(this);
     container->set_fixed_height(kTrayPopupItemHeight);
 
-    if (Shell::GetInstance()->tray_delegate()->GetWifiEnabled()) {
+    if (Shell::GetInstance()->system_tray_delegate()->GetWifiEnabled()) {
       NetworkIconInfo info;
-      Shell::GetInstance()->tray_delegate()->
+      Shell::GetInstance()->system_tray_delegate()->
           GetMostRelevantNetworkIcon(&info, true);
       container->AddIconAndLabel(info.image,
           info.description,
@@ -287,7 +287,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
       return;
 
     std::string carrier_id, topup_url, setup_url;
-    if (Shell::GetInstance()->tray_delegate()->
+    if (Shell::GetInstance()->system_tray_delegate()->
             GetCellularCarrierInfo(&carrier_id,
                                    &topup_url,
                                    &setup_url)) {
@@ -327,7 +327,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
     if (login() == user::LOGGED_IN_LOCKED)
       return;
 
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     if (IsNetworkListEmpty() && !delegate->GetWifiEnabled()) {
       turn_on_wifi_->SetVisible(true);
       other_wifi_->SetVisible(false);
@@ -347,7 +347,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
   virtual void CustomButtonPressed(views::Button* sender,
       const ui::Event& event) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == button_wifi_)
       delegate->ToggleWifi();
     else if (sender == button_mobile_)
@@ -364,7 +364,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
 
   virtual bool CustomLinkClickedOn(views::View* sender) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
+        ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == view_mobile_account_) {
       delegate->ShowCellularURL(topup_url_);
       return true;
@@ -594,7 +594,7 @@ views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
   messages_->messages().clear();
   HideNotificationView();
   if (request_wifi_view_) {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     // The Wi-Fi state is not toggled yet at this point.
     detailed_ = new tray::NetworkWifiDetailedView(this,
                                                   !delegate->GetWifiEnabled());
diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
index 7733390..ea224a0 100644
--- a/ash/system/chromeos/network/tray_vpn.cc
+++ b/ash/system/chromeos/network/tray_vpn.cc
@@ -29,7 +29,7 @@ class VpnDefaultView : public TrayItemMore {
 
   void Update() {
     NetworkIconInfo info;
-    Shell::GetInstance()->tray_delegate()->GetVirtualNetworkIcon(&info);
+    Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworkIcon(&info);
     SetImage(&info.image);
     SetLabel(info.description);
     SetAccessibleName(info.description);
@@ -66,7 +66,7 @@ class VpnListDetailedView : public NetworkListDetailedViewBase {
 
   virtual void GetAvailableNetworkList(
       std::vector<NetworkIconInfo>* list) OVERRIDE{
-    Shell::GetInstance()->tray_delegate()->GetVirtualNetworks(list);
+    Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(list);
   }
 
   virtual void RefreshNetworkScrollWithEmptyNetworkList() OVERRIDE {
@@ -102,7 +102,7 @@ class VpnListDetailedView : public NetworkListDetailedViewBase {
   virtual void CustomButtonPressed(views::Button* sender,
       const ui::Event& event) OVERRIDE {
     if (sender == other_vpn_)
-      ash::Shell::GetInstance()->tray_delegate()->ShowOtherVPN();
+      ash::Shell::GetInstance()->system_tray_delegate()->ShowOtherVPN();
     else
       NOTREACHED();
   }
@@ -141,7 +141,7 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
 
   // Do not show VPN line in uber tray bubble if VPN is not configured.
   std::vector<NetworkIconInfo> list;
-  Shell::GetInstance()->tray_delegate()->GetVirtualNetworks(&list);
+  Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(&list);
   if (list.size() == 0)
     return NULL;
 
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index ea0edf2..51c1f33 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -102,7 +102,7 @@ class DisplayView : public ash::internal::ActionableView {
     if (login_status_ == ash::user::LOGGED_IN_USER ||
         login_status_ == ash::user::LOGGED_IN_OWNER ||
         login_status_ == ash::user::LOGGED_IN_GUEST) {
-      ash::Shell::GetInstance()->tray_delegate()->ShowDisplaySettings();
+      ash::Shell::GetInstance()->system_tray_delegate()->ShowDisplaySettings();
     }
 
     return true;
diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc
index d90fa92..d35182d 100644
--- a/ash/system/date/date_view.cc
+++ b/ash/system/date/date_view.cc
@@ -145,7 +145,7 @@ bool DateView::PerformAction(const ui::Event& event) {
   if (!actionable_)
     return false;
 
-  ash::Shell::GetInstance()->tray_delegate()->ShowDateSettings();
+  ash::Shell::GetInstance()->system_tray_delegate()->ShowDateSettings();
   return true;
 }
 
@@ -164,8 +164,8 @@ void DateView::OnMouseExited(const ui::MouseEvent& event) {
 }
 
 TimeView::TimeView(TrayDate::ClockLayout clock_layout)
-    : hour_type_(
-          ash::Shell::GetInstance()->tray_delegate()->GetHourClockType()) {
+    : hour_type_(ash::Shell::GetInstance()->system_tray_delegate()->
+                 GetHourClockType()) {
   SetupLabels();
   UpdateTextInternal(base::Time::Now());
   UpdateClockLayout(clock_layout);
@@ -176,7 +176,8 @@ TimeView::~TimeView() {
 }
 
 void TimeView::UpdateTimeFormat() {
-  hour_type_ = ash::Shell::GetInstance()->tray_delegate()->GetHourClockType();
+  hour_type_ =
+      ash::Shell::GetInstance()->system_tray_delegate()->GetHourClockType();
   UpdateText();
 }
 
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index 1c7aa1c..0a473c8 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -108,7 +108,8 @@ class DateDefaultView : public views::View,
   // Overridden from views::ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
-    ash::SystemTrayDelegate* tray = ash::Shell::GetInstance()->tray_delegate();
+    ash::SystemTrayDelegate* tray =
+        ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == help_)
       tray->ShowHelp();
     else if (sender == shutdown_)
diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc
index 0c26584..07d7af8 100644
--- a/ash/system/drive/tray_drive.cc
+++ b/ash/system/drive/tray_drive.cc
@@ -53,7 +53,7 @@ string16 GetTrayLabel(const ash::DriveOperationStatusList& list) {
 
 ash::DriveOperationStatusList* GetCurrentOperationList() {
   ash::SystemTrayDelegate* delegate =
-      ash::Shell::GetInstance()->tray_delegate();
+      ash::Shell::GetInstance()->system_tray_delegate();
   ash::DriveOperationStatusList* list = new ash::DriveOperationStatusList();
   delegate->GetDriveOperationStatusList(list);
   return list;
@@ -286,7 +286,7 @@ class DriveDetailedView : public TrayDetailsView,
   }
 
   virtual void OnCancelOperation(const FilePath& file_path) {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     delegate->CancelDriveOperation(file_path);
   }
 
@@ -355,7 +355,7 @@ class DriveDetailedView : public TrayDetailsView,
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     if (sender == footer()->content()) {
       owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == settings_) {
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index ee05452..bd14d54 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -46,7 +46,7 @@ class IMEDefaultView : public TrayItemMore {
         IDR_AURA_UBER_TRAY_IME).ToImageSkia());
 
     IMEInfo info;
-    Shell::GetInstance()->tray_delegate()->GetCurrentIME(&info);
+    Shell::GetInstance()->system_tray_delegate()->GetCurrentIME(&info);
     UpdateLabel(info);
   }
 
@@ -67,7 +67,7 @@ class IMEDetailedView : public TrayDetailsView,
   IMEDetailedView(SystemTrayItem* owner, user::LoginStatus login)
       : TrayDetailsView(owner),
         login_(login) {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     IMEInfoList list;
     delegate->GetAvailableIMEList(&list);
     IMEPropertyInfoList property_list;
@@ -138,7 +138,7 @@ class IMEDetailedView : public TrayDetailsView,
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     if (sender == footer()->content()) {
       owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == settings_) {
@@ -213,7 +213,7 @@ class IMENotificationView : public TrayNotificationView {
   }
 
   views::Label* GetLabel() {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     IMEInfo current;
     delegate->GetCurrentIME(&current);
 
@@ -274,7 +274,7 @@ views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
 }
 
 views::View* TrayIME::CreateDefaultView(user::LoginStatus status) {
-  SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+  SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   IMEInfoList list;
   IMEPropertyInfoList property_list;
   delegate->GetAvailableIMEList(&list);
@@ -323,7 +323,7 @@ void TrayIME::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
 }
 
 void TrayIME::OnIMERefresh(bool show_message) {
-  SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+  SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   IMEInfoList list;
   IMEInfo current;
   IMEPropertyInfoList property_list;
diff --git a/ash/system/logout_button/tray_logout_button.cc b/ash/system/logout_button/tray_logout_button.cc
index 252df96..fe68b23 100644
--- a/ash/system/logout_button/tray_logout_button.cc
+++ b/ash/system/logout_button/tray_logout_button.cc
@@ -114,7 +114,7 @@ class LogoutButton : public views::View,
   // Overridden from views::ButtonListener.
   void ButtonPressed(views::Button* sender, const ui::Event& event) OVERRIDE {
     DCHECK_EQ(sender, button_);
-    Shell::GetInstance()->tray_delegate()->SignOut();
+    Shell::GetInstance()->system_tray_delegate()->SignOut();
   }
 
  private:
diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc
index 10f1722..78cf952 100644
--- a/ash/system/power/tray_power.cc
+++ b/ash/system/power/tray_power.cc
@@ -181,7 +181,7 @@ views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
   // there is a battery or not. So always create this, and adjust visibility as
   // necessary.
   PowerSupplyStatus power_status =
-      ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
+      ash::Shell::GetInstance()->system_tray_delegate()->GetPowerSupplyStatus();
   CHECK(power_tray_ == NULL);
   power_tray_ = new tray::PowerTrayView();
   power_tray_->UpdatePowerStatus(power_status);
@@ -190,14 +190,14 @@ views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
 
 views::View* TrayPower::CreateDefaultView(user::LoginStatus status) {
   // Make sure icon status is up-to-date. (Also triggers stub activation).
-  ash::Shell::GetInstance()->tray_delegate()->RequestStatusUpdate();
+  ash::Shell::GetInstance()->system_tray_delegate()->RequestStatusUpdate();
   return NULL;
 }
 
 views::View* TrayPower::CreateNotificationView(user::LoginStatus status) {
   CHECK(notification_view_ == NULL);
   PowerSupplyStatus power_status =
-      ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
+      ash::Shell::GetInstance()->system_tray_delegate()->GetPowerSupplyStatus();
   if (!power_status.battery_is_present)
     return NULL;
 
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc
index ad81ca6..8cc12d6 100644
--- a/ash/system/settings/tray_settings.cc
+++ b/ash/system/settings/tray_settings.cc
@@ -57,8 +57,8 @@ class SettingsDefaultView : public ash::internal::ActionableView {
       power_view_right_align = true;
     }
 
-    PowerSupplyStatus power_status =
-        ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
+    PowerSupplyStatus power_status = ash::Shell::GetInstance()->
+        system_tray_delegate()->GetPowerSupplyStatus();
     if (power_status.battery_is_present) {
       power_status_view_ = new ash::internal::PowerStatusView(
           ash::internal::PowerStatusView::VIEW_DEFAULT, power_view_right_align);
@@ -86,7 +86,7 @@ class SettingsDefaultView : public ash::internal::ActionableView {
         login_status_ == user::LOGGED_IN_LOCKED)
       return false;
 
-    ash::Shell::GetInstance()->tray_delegate()->ShowSettings();
+    ash::Shell::GetInstance()->system_tray_delegate()->ShowSettings();
     return true;
   }
 
@@ -137,7 +137,7 @@ views::View* TraySettings::CreateTrayView(user::LoginStatus status) {
 
 views::View* TraySettings::CreateDefaultView(user::LoginStatus status) {
   if ((status == user::LOGGED_IN_NONE || status == user::LOGGED_IN_LOCKED) &&
-      (!ash::Shell::GetInstance()->tray_delegate()->
+      (!ash::Shell::GetInstance()->system_tray_delegate()->
           GetPowerSupplyStatus().battery_is_present))
     return NULL;
 
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index c1b165f..f4d8420 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -46,7 +46,8 @@ StatusAreaWidget::~StatusAreaWidget() {
 void StatusAreaWidget::CreateTrayViews() {
   AddSystemTray();
   AddWebNotificationTray();
-  SystemTrayDelegate* delegate = ash::Shell::GetInstance()->tray_delegate();
+  SystemTrayDelegate* delegate =
+      ash::Shell::GetInstance()->system_tray_delegate();
   DCHECK(delegate);
   // Initialize after all trays have been created.
   if (system_tray_)
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 8b09994..d225ce0 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -77,7 +77,7 @@ class SystemBubbleWrapper {
                 views::View* anchor,
                 TrayBubbleView::InitParams* init_params) {
     user::LoginStatus login_status =
-        Shell::GetInstance()->tray_delegate()->GetUserLoginStatus();
+        Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
     bubble_->InitView(anchor, login_status, init_params);
     bubble_wrapper_.reset(
         new internal::TrayBubbleWrapper(tray, bubble_->bubble_view()));
@@ -158,14 +158,14 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
     AddTrayItem(new internal::TrayMonitor(this));
 #endif
 
-  SetVisible(ash::Shell::GetInstance()->tray_delegate()->
+  SetVisible(ash::Shell::GetInstance()->system_tray_delegate()->
       GetTrayVisibilityOnStartup());
 }
 
 void SystemTray::AddTrayItem(SystemTrayItem* item) {
   items_.push_back(item);
 
-  SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+  SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus());
   item->UpdateAfterShelfAlignmentChange(shelf_alignment());
 
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc
index d9b4288..8274d79 100644
--- a/ash/system/tray/system_tray_bubble.cc
+++ b/ash/system/tray/system_tray_bubble.cc
@@ -202,7 +202,8 @@ void SystemTrayBubble::UpdateView(
 
   items_ = items;
   bubble_type_ = bubble_type;
-  CreateItemViews(Shell::GetInstance()->tray_delegate()->GetUserLoginStatus());
+  CreateItemViews(
+      Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus());
 
   // Close bubble view if we failed to create the item view.
   if (!bubble_view_->has_children()) {
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index 644e7eb..9f468ad 100644
--- a/ash/system/tray_accessibility.cc
+++ b/ash/system/tray_accessibility.cc
@@ -39,7 +39,7 @@ bool IsAnyAccessibilityFeatureEnabled() {
 }
 
 user::LoginStatus GetCurrentLoginStatus() {
-  return Shell::GetInstance()->tray_delegate()->GetUserLoginStatus();
+  return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
 }
 
 }  // namespace
@@ -182,7 +182,8 @@ class AccessibilityDetailedView : public TrayDetailsView,
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
-    SystemTrayDelegate* tray_delegate = Shell::GetInstance()->tray_delegate();
+    SystemTrayDelegate* tray_delegate =
+        Shell::GetInstance()->system_tray_delegate();
     if (sender == help_view_)
       tray_delegate->ShowAccessibilityHelp();
   }
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index 5be9d49..9843766 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -84,7 +84,7 @@ class UpdateView : public ash::internal::ActionableView {
  private:
   // Overridden from ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE {
-    ash::Shell::GetInstance()->tray_delegate()->RequestRestart();
+    ash::Shell::GetInstance()->system_tray_delegate()->RequestRestart();
     return true;
   }
 
@@ -165,11 +165,11 @@ TrayUpdate::~TrayUpdate() {
 }
 
 bool TrayUpdate::GetInitialVisibility() {
-  return Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade();
+  return Shell::GetInstance()->system_tray_delegate()->SystemShouldUpgrade();
 }
 
 views::View* TrayUpdate::CreateDefaultView(user::LoginStatus status) {
-  if (!Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade())
+  if (!Shell::GetInstance()->system_tray_delegate()->SystemShouldUpgrade())
     return NULL;
   return new UpdateView(severity_);
 }
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index 4403136..c7277bf 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -225,7 +225,7 @@ PublicAccountUserDetails::PublicAccountUserDetails(SystemTrayItem* owner,
       kUserDetailsVerticalPadding, rtl ? inner_padding : 0));
 
   ash::SystemTrayDelegate* delegate =
-      ash::Shell::GetInstance()->tray_delegate();
+      ash::Shell::GetInstance()->system_tray_delegate();
   // Retrieve the user's display name and wrap it with markers.
   string16 display_name = delegate->GetUserDisplayName();
   RemoveChars(display_name, kDisplayNameMark, &display_name);
@@ -334,7 +334,7 @@ void PublicAccountUserDetails::OnPaint(gfx::Canvas* canvas) {
 void PublicAccountUserDetails::LinkClicked(views::Link* source,
                                            int event_flags) {
   DCHECK_EQ(source, learn_more_);
-  ash::Shell::GetInstance()->tray_delegate()->ShowPublicAccountInfo();
+  ash::Shell::GetInstance()->system_tray_delegate()->ShowPublicAccountInfo();
 }
 
 void PublicAccountUserDetails::CalculatePreferredSize(SystemTrayItem* owner,
@@ -444,7 +444,7 @@ void UserView::Layout() {
 
 void UserView::ButtonPressed(views::Button* sender, const ui::Event& event) {
   DCHECK_EQ(logout_button_, sender);
-  ash::Shell::GetInstance()->tray_delegate()->SignOut();
+  ash::Shell::GetInstance()->system_tray_delegate()->SignOut();
 }
 
 void UserView::AddLogoutButton(ash::user::LoginStatus login) {
@@ -501,8 +501,9 @@ void UserView::AddUserCard(SystemTrayItem* owner,
   }
 
   RoundedImageView* avatar = new RoundedImageView(kProfileRoundedCornerRadius);
-  avatar->SetImage(ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
-                   gfx::Size(kUserIconSize, kUserIconSize));
+  avatar->SetImage(
+      ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(),
+      gfx::Size(kUserIconSize, kUserIconSize));
   user_card_->AddChildView(avatar);
 
   if (login == ash::user::LOGGED_IN_PUBLIC) {
@@ -512,7 +513,7 @@ void UserView::AddUserCard(SystemTrayItem* owner,
   }
 
   ash::SystemTrayDelegate* delegate =
-      ash::Shell::GetInstance()->tray_delegate();
+      ash::Shell::GetInstance()->system_tray_delegate();
   views::View* details = new views::View;
   details->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, 0, kUserDetailsVerticalPadding, 0));
@@ -590,7 +591,7 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
     case user::LOGGED_IN_OWNER:
     case user::LOGGED_IN_PUBLIC:
       avatar_->SetImage(
-          ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
+          ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(),
           gfx::Size(kUserIconSize, kUserIconSize));
       avatar_->SetVisible(true);
       break;
@@ -634,7 +635,7 @@ void TrayUser::OnUserUpdate() {
   // Check for null to avoid crbug.com/150944.
   if (avatar_) {
     avatar_->SetImage(
-        ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
+        ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
diff --git a/ash/wm/gestures/bezel_gesture_handler.cc b/ash/wm/gestures/bezel_gesture_handler.cc
index 9b503bc..aa30eba 100644
--- a/ash/wm/gestures/bezel_gesture_handler.cc
+++ b/ash/wm/gestures/bezel_gesture_handler.cc
@@ -117,7 +117,7 @@ bool BezelGestureHandler::HandleDeviceControl(
       delegate->SetBrightnessPercent(
           LimitBezelBrightnessFromSlider(percent), true);
   } else if (start_location_ == BEZEL_START_RIGHT) {
-    Shell::GetInstance()->tray_delegate()->GetVolumeControlDelegate()->
+    Shell::GetInstance()->system_tray_delegate()->GetVolumeControlDelegate()->
         SetVolumePercent(percent);
   } else {
     // No further events are necessary.
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index 4218c49..d6afd42 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -285,7 +285,7 @@ TEST_F(SystemGestureEventFilterTest, DeviceControl) {
 
   DummyVolumeControlDelegate* delegateVolume =
       new DummyVolumeControlDelegate();
-  ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate(
+  ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
       scoped_ptr<VolumeControlDelegate>(delegateVolume).Pass());
 
   const int kTouchId = 5;
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 98c9ab8..c487cc9 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -408,7 +408,7 @@ void TestingAutomationProvider::AddLoginEventObserver(
 
 void TestingAutomationProvider::SignOut(DictionaryValue* args,
                                         IPC::Message* reply_message) {
-  ash::Shell::GetInstance()->tray_delegate()->SignOut();
+  ash::Shell::GetInstance()->system_tray_delegate()->SignOut();
   // Sign out has the side effect of restarting the session_manager
   // and chrome, thereby severing the automation channel, so it's
   // not really necessary to send a reply back. The next line is
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc
index e17d29e..1e71dca 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -189,7 +189,7 @@ void OfflineLoadPage::CommandReceived(const std::string& cmd) {
   } else if (command == "dontproceed") {
     interstitial_page_->DontProceed();
   } else if (command == "open_network_settings") {
-    ash::Shell::GetInstance()->tray_delegate()->ShowNetworkSettings();
+    ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings();
   } else {
     LOG(WARNING) << "Unknown command:" << cmd;
   }
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
index 749b542..6e48b67 100644
--- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
@@ -33,8 +33,8 @@ std::string GetUserLoginStatus() {
       { ash::user::LOGGED_IN_NONE, "none" },
   };
   const ash::user::LoginStatus status =
-      ash::Shell::GetInstance()->tray_delegate() ?
-      ash::Shell::GetInstance()->tray_delegate()->GetUserLoginStatus() :
+      ash::Shell::GetInstance()->system_tray_delegate() ?
+      ash::Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() :
       ash::user::LOGGED_IN_NONE;
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kStatusStrings); ++i) {