Prepare status area to support multiple trays.

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/ash_export.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/tray_background_view.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 115 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_; }
+  // Overridden from TrayBackgroundView.
+  virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
 
  private:
   friend class internal::SystemTrayLayerAnimationObserver;
   friend class internal::SystemTrayBubble;
 
   // Resets |bubble_| and clears any related state.
   void DestroyBubble();
 
   // Called when the widget associated with |bubble| closes. |bubble| should
   // always == |bubble_|. This triggers destroying |bubble_| and hiding the
@@ skipping 66 matching lines @@
 
   // Bubble for default and detailed views.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
   // Buble for notifications.
   scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
-  // Shelf alignment.
-  ShelfAlignment shelf_alignment_;
-
   scoped_ptr<internal::SystemTrayLayerAnimationObserver>
       layer_animation_observer_;
 
   // Keep track of the default view height so that when we create detailed
   // views directly (e.g. from a notification) we know what height to use.
   int default_bubble_height_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_