[Launcher per display] Removed Shell::status_area_widget(), system_tray()
HasPrimaryStatusArea/GetPrimarySystemTray for login screen
which will have only one tray/status area on primary
BUG=145978
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11476033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172169 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index a8cb82f..92185a6a 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -32,6 +32,7 @@
namespace ash {
class Launcher;
+class SystemTray;
class ToplevelWindowEventHandler;
namespace internal {
@@ -62,6 +63,12 @@
// RootWindowController otherwise.
static RootWindowController* ForLauncher(aura::Window* window);
+ // Returns a RootWindowController of the window's root window.
+ static RootWindowController* ForWindow(aura::Window* window);
+
+ // Returns the RootWindowController of the active root window.
+ static internal::RootWindowController* ForActiveRootWindow();
+
aura::RootWindow* root_window() { return root_window_.get(); }
RootWindowLayoutManager* root_window_layout() { return root_window_layout_; }
@@ -76,10 +83,15 @@
ShelfLayoutManager* shelf() const { return shelf_; }
- StatusAreaWidget* status_area_widget() const {
+ StatusAreaWidget* status_area_widget() {
return status_area_widget_;
}
+ // Returns the system tray on this root window. Note that
+ // calling this on the root window that doesn't have a launcher will
+ // lead to a crash.
+ SystemTray* GetSystemTray();
+
// Shows context menu at the |location_in_screen|. This uses
// |ShellDelegate::CreateContextMenu| to define the content of the menu.
void ShowContextMenu(const gfx::Point& location_in_screen);
