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

ash/root_window_controller.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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shelf_types.h"
 #include "ash/system/user/login_status.h"
@@ skipping 14 matching lines @@
 
 namespace views {
 namespace corewm {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
 }
 }
 
 namespace ash {
 class Launcher;
+class SystemTray;
 class ToplevelWindowEventHandler;
 
 namespace internal {
 
 class BootSplashScreen;
 class PanelLayoutManager;
 class RootWindowLayoutManager;
 class ScreenDimmer;
 class ShelfLayoutManager;
 class StatusAreaWidget;
@@ skipping 10 matching lines @@
  public:
   explicit RootWindowController(aura::RootWindow* root_window);
   ~RootWindowController();
 
   // Returns a RootWindowController that has a launcher for given
   // |window|. This returns the RootWindowController for the |window|'s
   // root window when multiple launcher mode is enabled, or the primary
   // RootWindowController otherwise.
   static RootWindowController* ForLauncher(aura::Window* window);
 
+  // Returns a RootWnidowController of the window's root window.

[sky, 2012/12/07 23:53:00]

RootWindowController

[oshima, 2012/12/08 00:00:45]

Done.

+  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_; }
 
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
   ScreenDimmer* screen_dimmer() { return screen_dimmer_.get(); }
 
   Launcher* launcher() { return launcher_.get(); }
 
   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

[sky, 2012/12/07 23:53:00]

Calling -> calling

[oshima, 2012/12/08 00:00:45]

Done.

+  // 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);
 
   // Returns the layout-manager for the appropriate modal-container. If the
   // window is inside the lockscreen modal container, then the layout manager
   // for that is returned. Otherwise the layout manager for the default modal
   // container is returned.
   // If no window is specified (i.e. |window| is NULL), then the lockscreen
   // modal container is used if the screen is currently locked. Otherwise, the
@@ skipping 92 matching lines @@
   scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace internal
 }  // ash
 
 #endif  //  ASH_ROOT_WINDOW_CONTROLLER_H_