Prepare status area to support multiple trays.

* Moves system tray ownership and creation to status area widget.
* Status area is laid out as a grid for support of additional trays.
* Shelf alignment property is moved to TrayBackgroundView

BUG=124914
TEST=Status area tests and functionality should be unaffected.
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10535112

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141671 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/ash/shell.h b/ash/shell.h
index abc7612..c178cbf 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -270,7 +270,7 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
   }
 
   ShellDelegate* delegate() { return delegate_.get(); }
-  SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
+
   UserWallpaperDelegate* user_wallpaper_delegate() {
     return user_wallpaper_delegate_.get();
   }
@@ -308,7 +308,9 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
     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;
@@ -388,7 +390,6 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
 #endif  // !defined(OS_MACOSX)
 
   scoped_ptr<ShellDelegate> delegate_;
-  scoped_ptr<SystemTrayDelegate> tray_delegate_;
   scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
 
   scoped_ptr<Launcher> launcher_;
@@ -467,9 +468,6 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
   // 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_;