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

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 2f08927ccab2034a515ff1cb8a4bf41642431dee..fa37bd870df927f7a15bfba740299f3bd4f4eacd 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -75,6 +75,7 @@ class SystemTray;
 class UserActivityDetector;
 class UserWallpaperDelegate;
 class VideoDetector;
+class WebNotificationTray;
 class WindowCycleController;
 
 namespace internal {
@@ -232,6 +233,10 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
   // Called when the user logs in.
   void OnLoginStateChanged(user::LoginStatus status);
 
+  // Called when the login status changes.
+  // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
+  void UpdateAfterLoginStatusChange(user::LoginStatus status);
+
   // Called when the application is exiting.
   void OnAppTerminating();
 
@@ -311,9 +316,6 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
     return magnification_controller_.get();
   }
 
-  // TODO(oshima): Remove methods that are moved to RootWindowController.
-  Launcher* launcher();
-
   const ScreenAsh* screen() { return screen_.get(); }
 
   // Force the shelf to query for it's current visibility state.
@@ -338,10 +340,8 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
   // on all displays.
   void OnModalWindowRemoved(aura::Window* removed);
 
-  // TODO(sky): don't expose this!
-  internal::ShelfLayoutManager* shelf() const;
-
-  internal::StatusAreaWidget* status_area_widget() const;
+  // Returns WebNotificationTray on the primary root window.
+  WebNotificationTray* GetWebNotificationTray();

[sky, 2012/10/17 16:25:20]

I thought we were only going to have the tray on the primary monitor? Maybe I'm
wrong there.

[oshima, 2012/10/17 17:49:43]

All launchers will have trays (menu/battery/ime), except for notifications
Notifications are shown only on primary for now.

 
   // Convenience accessor for members of StatusAreaWidget.
   SystemTrayDelegate* tray_delegate();