Remove Shell::shelf()|status_area_widget()|launcher()

chrome/browser/chromeos/system/ash_system_tray_delegate.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/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/brightness/brightness_observer.h"
 #include "ash/system/date/clock_observer.h"
 #include "ash/system/drive/drive_observer.h"
 #include "ash/system/ime/ime_observer.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/power/power_status_observer.h"
-#include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/user/update_observer.h"
 #include "ash/system/user/user_observer.h"
 #include "ash/volume_control_delegate.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/chromeos/chromeos_version.h"
@@ skipping 909 matching lines @@
         OnPowerStatusChanged(power_status));
   }
 
   virtual void SystemResumed() OVERRIDE {
     NotifyRefreshClock();
   }
 
   // Overridden from SessionManagerClient::Observer.
   virtual void LockScreen() OVERRIDE {
     screen_locked_ = true;
-    ash::Shell::GetInstance()->status_area_widget()->
-        UpdateAfterLoginStatusChange(GetUserLoginStatus());
+    ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
+        GetUserLoginStatus());
   }
 
   virtual void UnlockScreen() OVERRIDE {
     screen_locked_ = false;
-    ash::Shell::GetInstance()->status_area_widget()->
-        UpdateAfterLoginStatusChange(GetUserLoginStatus());
+    ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
+        GetUserLoginStatus());
   }
 
   // TODO(sad): Override more from PowerManagerClient::Observer here (e.g.
   // PowerButtonStateChanged etc.).
 
   // Overridden from NetworkMenuIcon::Delegate.
   virtual void NetworkMenuIconChanged() OVERRIDE {
     NotifyRefreshNetwork();
   }
 
@@ skipping 103 matching lines @@
         break;
       }
       case chrome::NOTIFICATION_PROFILE_CREATED: {
         SetProfile(content::Source<Profile>(source).ptr());
         registrar_.Remove(this,
                           chrome::NOTIFICATION_PROFILE_CREATED,
                           content::NotificationService::AllSources());
         break;
       }
       case chrome::NOTIFICATION_SESSION_STARTED: {
-        ash::Shell::GetInstance()->status_area_widget()->
-            UpdateAfterLoginStatusChange(GetUserLoginStatus());
+        ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
+            GetUserLoginStatus());
         SetProfile(ProfileManager::GetDefaultProfile());
         break;
       }
       default:
         NOTREACHED();
     }
   }
 
   // Overridden from InputMethodManager::Observer.
   virtual void InputMethodChanged(
@@ skipping 171 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos