Revert 133691 because it accidentally reverted revs 133686 and 133684.

ash/system/tray/system_tray.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_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #pragma once
 
 #include "ash/launcher/background_animator.h"
 #include "ash/ash_export.h"
@@ skipping 31 matching lines @@
 
 class ASH_EXPORT SystemTray : NON_EXPORTED_BASE(
                                   public internal::ActionableView),
                               public views::Widget::Observer,
                               public internal::BackgroundAnimatorDelegate,
                               public base::MessagePumpObserver {
  public:
   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);
 
   // Removes an existing tray item.
   void RemoveTrayItem(SystemTrayItem* item);
 
   // Shows the default view of all items.
   void ShowDefaultView();
 
   // Shows details of a particular item. If |close_delay_in_seconds| is
@@ skipping 13 matching lines @@
 
   // Sets whether the tray paints a background. Default is true, but is set to
   // false if a window overlaps the shelf.
   void SetPaintsBackground(
       bool value,
       internal::BackgroundAnimator::ChangeType change_type);
 
   // 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_;
   }
   AudioObserver* audio_observer() const {
     return audio_observer_;
   }
   BluetoothObserver* bluetooth_observer() const {
     return bluetooth_observer_;
   }
   BrightnessObserver* brightness_observer() const {
@@ skipping 15 matching lines @@
     return power_status_observer_;
   }
   UpdateObserver* update_observer() const {
     return update_observer_;
   }
   UserObserver* user_observer() const {
     return user_observer_;
   }
 
  private:
-  friend class Shell;
-
   void ShowItems(std::vector<SystemTrayItem*>& items,
                  bool details,
                  bool activate);
 
   // Overridden from internal::ActionableView.
   virtual bool PerformAction(const views::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
@@ skipping 25 matching lines @@
   BluetoothObserver* bluetooth_observer_;
   BrightnessObserver* brightness_observer_;
   CapsLockObserver* caps_lock_observer_;
   ClockObserver* clock_observer_;
   IMEObserver* ime_observer_;
   NetworkObserver* network_observer_;
   PowerStatusObserver* power_status_observer_;
   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_;
 
   // Owned by the view it's installed on.
   internal::SystemTrayBackground* background_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
   internal::BackgroundAnimator hide_background_animator_;
   internal::BackgroundAnimator hover_background_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_