Prepare status area to support multiple trays.

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_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 252 matching lines @@
     return window_cycle_controller_.get();
   }
   internal::FocusCycler* focus_cycler() {
     return focus_cycler_.get();
   }
   internal::MonitorController* monitor_controller() {
     return monitor_controller_.get();
   }
 
   ShellDelegate* delegate() { return delegate_.get(); }
-  SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
+
   UserWallpaperDelegate* user_wallpaper_delegate() {
     return user_wallpaper_delegate_.get();
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
 
   internal::MagnificationController* magnification_controller() {
     return magnification_controller_.get();
@@ skipping 17 matching lines @@
   void SetShelfAlignment(ShelfAlignment alignment);
   ShelfAlignment GetShelfAlignment();
 
   // TODO(sky): don't expose this!
   internal::ShelfLayoutManager* shelf() const { return shelf_; }
 
   internal::StatusAreaWidget* status_area_widget() const {
     return status_area_widget_;
   }
 
-  SystemTray* system_tray() const { return system_tray_.get(); }
+  // Convenience accessor for members of StatusAreaWidget.
+  SystemTrayDelegate* tray_delegate();
+  SystemTray* system_tray();
 
   // Returns the size of the grid.
   int GetGridSize() const;
 
   // Returns true if in maximized or fullscreen mode.
   bool IsInMaximizedMode() const;
 
   static void set_initially_hide_cursor(bool hide) {
     initially_hide_cursor_ = hide;
   }
@@ skipping 59 matching lines @@
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
 #if !defined(OS_MACOSX)
   scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
 
   scoped_ptr<AcceleratorController> accelerator_controller_;
 #endif  // !defined(OS_MACOSX)
 
   scoped_ptr<ShellDelegate> delegate_;
-  scoped_ptr<SystemTrayDelegate> tray_delegate_;
   scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
 
   scoped_ptr<Launcher> launcher_;
 
   scoped_ptr<internal::AppListController> app_list_controller_;
 
   scoped_ptr<internal::ShellContextMenu> shell_context_menu_;
   scoped_ptr<internal::StackingController> stacking_controller_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::CaptureController> capture_controller_;
@@ skipping 58 matching lines @@
   internal::PanelLayoutManager* panel_layout_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // Owned by aura::RootWindow, cached here for type safety.
   internal::RootWindowLayoutManager* root_window_layout_;
 
   // Widget containing system tray.
   internal::StatusAreaWidget* status_area_widget_;
 
-  // System tray with clock, Wi-Fi signal, etc.
-  scoped_ptr<SystemTray> system_tray_;
-
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_