Add left/right layout support for uber tray.

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"
 #include "ash/system/tray/tray_views.h"
 #include "ash/system/user/login_status.h"
+#include "ash/wm/shelf_auto_hide_behavior.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/view.h"
 
 #include <map>
 #include <vector>
 
 namespace ash {
@@ skipping 10 matching lines @@
 class NetworkObserver;
 class PowerStatusObserver;
 class UpdateObserver;
 class UserObserver;
 
 class SystemTrayItem;
 
 namespace internal {
 class SystemTrayBackground;
 class SystemTrayBubble;
+class SystemTrayContainer;
 class SystemTrayLayerAnimationObserver;
 }
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
 
 class ASH_EXPORT SystemTray : public internal::ActionableView,
@@ skipping 91 matching lines @@
   }
   UserObserver* user_observer() const {
     return user_observer_;
   }
 
   // Accessors for testing.
 
   // Returns true if the bubble exists.
   bool CloseBubbleForTest() const;
 
+  void SetShelfAlignment(ShelfAlignment alignment);
+  ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
+
  private:
   friend class internal::SystemTrayLayerAnimationObserver;
   friend class internal::SystemTrayBubble;
 
   // Called when the widget associated with |bubble| closes. |bubble| should
   // always == |bubble_|. This triggers destroying |bubble_| and hiding the
   // launcher if necessary.
   void RemoveBubble(internal::SystemTrayBubble* bubble);
 
   const ScopedVector<SystemTrayItem>& items() const { return items_; }
@@ skipping 34 matching lines @@
   virtual void UpdateBackground(int alpha) OVERRIDE;
 
   // Owned items.
   ScopedVector<SystemTrayItem> items_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_;
   std::vector<SystemTrayItem*> notification_items_;
 
   // The container for all the tray views of the items.
-  views::View* tray_container_;
+  internal::SystemTrayContainer* tray_container_;
 
   // Mappings of system tray item and it's view in the tray.
   std::map<SystemTrayItem*, views::View*> tray_item_map_;
 
   // These observers are not owned by the tray.
   AccessibilityObserver* accessibility_observer_;
   AudioObserver* audio_observer_;
   BluetoothObserver* bluetooth_observer_;
   BrightnessObserver* brightness_observer_;
   CapsLockObserver* caps_lock_observer_;
@@ skipping 14 matching lines @@
 
   // Buble for notifications.
   scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
 
   // Owned by the view it's installed on.
   internal::SystemTrayBackground* background_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
+  // Shelf alignment.
+  ShelfAlignment shelf_alignment_;
+
   internal::BackgroundAnimator hide_background_animator_;
   internal::BackgroundAnimator hover_background_animator_;
   scoped_ptr<internal::SystemTrayLayerAnimationObserver>
       layer_animation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_