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

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 57 matching lines @@
 class NestedDispatcherController;
 class PowerButtonController;
 class ScreenAsh;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTray;
 class UserActivityDetector;
 class UserWallpaperDelegate;
 class VideoDetector;
+class WebNotificationTray;
 class WindowCycleController;
 
 namespace internal {
 class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
@@ skipping 137 matching lines @@
   // Sets the work area insets of the display that contains |window|,
   // this notifies observers too.
   // TODO(sky): this no longer really replicates what happens and is unreliable.
   // Remove this.
   void SetDisplayWorkAreaInsets(aura::Window* window,
                                 const gfx::Insets& insets);
 
   // Called when the user logs in.
   void OnLoginStateChanged(user::LoginStatus status);
 
+  // Called when the login status changes.
+  // TODO(oshima): Find out if we can merge this and |OnLoginStateChanged|.
+  void UpdateAfterLoginStatusChange(user::LoginStatus status);
+
   // Called when the application is exiting.
   void OnAppTerminating();
 
   // Called when the screen is locked (after the lock window is visible) or
   // unlocked.
   void OnLockStateChanged(bool locked);
 
   // Initializes |launcher_|.  Does nothing if it's already initialized.
   void CreateLauncher();
 
@@ skipping 59 matching lines @@
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
 
   internal::MagnificationController* magnification_controller() {
     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.
   void UpdateShelfVisibility();
 
   // Sets/gets the shelf auto-hide behavior.
   void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior);
   ShelfAutoHideBehavior GetShelfAutoHideBehavior() const;
 
   void SetShelfAlignment(ShelfAlignment alignment);
   ShelfAlignment GetShelfAlignment();
 
   // Dims or undims the screen.
   void SetDimming(bool should_dim);
 
   // Creates modal background, which is a partially-opaque fullscreen
   // window, on all displays.
   void CreateModalBackground();
 
   // Called when a modal window is removed. It will activate
   // another modal window if any, or remove modal screens
   // on all displays.
   void OnModalWindowRemoved(aura::Window* removed);
 
-  // TODO(sky): don't expose this!
-  internal::ShelfLayoutManager* shelf() const;
-
-  internal::StatusAreaWidget* status_area_widget() const;
+  // Return WebNotificationTray on the primary root window.
+  WebNotificationTray* GetWebNotificationTray();
 
   // Convenience accessor for members of StatusAreaWidget.
   SystemTrayDelegate* tray_delegate();
   SystemTray* system_tray();
 
   static void set_initially_hide_cursor(bool hide) {
     initially_hide_cursor_ = hide;
   }
 
   internal::ResizeShadowController* resize_shadow_controller() {
@@ skipping 138 matching lines @@
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_