[Launcher per display] Removed Shell::status_area_widget(), system_tray()

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"
@@ skipping 745 matching lines @@
   {
     return volume_control_delegate_.get();
   }
 
   virtual void SetVolumeControlDelegate(
       scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE {
     volume_control_delegate_.swap(delegate);
   }
 
  private:
-  ash::SystemTray* GetSystemTray() {
-    return ash::Shell::GetInstance()->system_tray();
+  ash::SystemTray* GetPrimarySystemTray() {
+    return ash::Shell::GetInstance()->GetPrimarySystemTray();
   }
 
   ash::SystemTrayNotifier* GetSystemTrayNotifier() {
     return ash::Shell::GetInstance()->system_tray_notifier();
   }
 
   // Returns the last active browser. If there is no such browser, creates a new
   // browser window with an empty tab and returns it.
   Browser* GetAppropriateBrowser() {
     return browser::FindOrCreateTabbedBrowser(
@@ skipping 207 matching lines @@
 
   virtual bool ShouldOpenButtonOptions() const OVERRIDE {
     return false;
   }
 
   // Overridden from NetworkLibrary::NetworkManagerObserver.
   virtual void OnNetworkManagerChanged(NetworkLibrary* crosnet) OVERRIDE {
     RefreshNetworkObserver(crosnet);
     RefreshNetworkDeviceObserver(crosnet);
     data_promo_notification_->ShowOptionalMobileDataPromoNotification(
-        crosnet, GetSystemTray(), this);
+        crosnet, GetPrimarySystemTray(), this);
 
     NotifyRefreshNetwork();
   }
 
   // Overridden from NetworkLibrary::NetworkObserver.
   virtual void OnNetworkChanged(NetworkLibrary* crosnet,
       const Network* network) OVERRIDE {
     NotifyRefreshNetwork();
   }
 
@@ skipping 241 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos