Revert 133691 because it accidentally reverted revs 133686 and 133684.

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
===================================================================
--- ash/system/tray/system_tray.h	(revision 133697)
+++ ash/system/tray/system_tray.h	(working copy)
@@ -49,6 +49,12 @@
   SystemTray();
   virtual ~SystemTray();
 
+  // Creates the default set of items for the sytem tray.
+  void CreateItems();
+
+  // Creates the widget for the tray.
+  void CreateWidget();
+
   // Adds a new item in the tray.
   void AddTrayItem(SystemTrayItem* item);
 
@@ -82,6 +88,8 @@
   // Returns true if the launcher should show.
   bool should_show_launcher() const { return popup_ && should_show_launcher_; }
 
+  views::Widget* widget() const { return widget_; }
+
   AccessibilityObserver* accessibility_observer() const {
     return accessibility_observer_;
   }
@@ -117,8 +125,6 @@
   }
 
  private:
-  friend class Shell;
-
   void ShowItems(std::vector<SystemTrayItem*>& items,
                  bool details,
                  bool activate);
@@ -164,6 +170,9 @@
   UpdateObserver* update_observer_;
   UserObserver* user_observer_;
 
+  // The widget hosting the tray.
+  views::Widget* widget_;
+
   // The popup widget and the delegate.
   internal::SystemTrayBubble* bubble_;
   views::Widget* popup_;
Property changes on: ash/system/tray/system_tray.h
___________________________________________________________________
Added: svn:mergeinfo