Remove Shell::shelf|status_area_widget|launcher and
updated all clients to use one on RootWindowController and/or
Launcher::ForPrimaryDisplay/ForWindow.
BUG=145978
Review URL: https://chromiumcodereview.appspot.com/11017079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162664 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/shell.h b/ash/shell.h
index dbcc2fd70..4f4586a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -75,6 +75,7 @@
class UserActivityDetector;
class UserWallpaperDelegate;
class VideoDetector;
+class WebNotificationTray;
class WindowCycleController;
namespace internal {
@@ -237,6 +238,10 @@
// 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();
@@ -316,9 +321,6 @@
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.
@@ -343,10 +345,8 @@
// 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();
// Convenience accessor for members of StatusAreaWidget.
SystemTrayDelegate* tray_delegate();
