Prepare status area to support multiple trays.

ash/system/tray/system_tray.cc

 // 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.
 
 #include "ash/system/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 120 matching lines @@
       brightness_observer_(NULL),
       caps_lock_observer_(NULL),
       clock_observer_(NULL),
       drive_observer_(NULL),
       ime_observer_(NULL),
       locale_observer_(NULL),
       network_observer_(NULL),
       update_observer_(NULL),
       user_observer_(NULL),
       should_show_launcher_(false),
-      shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
       default_bubble_height_(0) {
   tray_container_ = new internal::SystemTrayContainer;
   tray_container_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, 0));
   tray_container_->set_border(
       views::Border::CreateEmptyBorder(1, 1, 1, 1));
   SetContents(tray_container_);
   SetBorder();
 }
 
@@ skipping 316 matching lines @@
 void SystemTray::UpdateNotificationAnchor() {
   if (!notification_bubble_.get())
     return;
   notification_bubble_->bubble_view()->UpdateAnchor();
   // Ensure that the notification buble is above the launcher/status area.
   notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
 }
 
 void SystemTray::SetBorder() {
   // Change the border padding for different shelf alignment.
-  if (shelf_alignment_ == SHELF_ALIGNMENT_BOTTOM) {
+  if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
     set_border(views::Border::CreateEmptyBorder(0, 0,
         kPaddingFromBottomOfScreenBottomAlignment,
         kPaddingFromRightEdgeOfScreenBottomAlignment));
-  } else if (shelf_alignment_ == SHELF_ALIGNMENT_LEFT) {
+  } else if (shelf_alignment() == SHELF_ALIGNMENT_LEFT) {
     set_border(views::Border::CreateEmptyBorder(0,
         kPaddingFromEdgeOfScreenVerticalAlignment,
         kPaddingFromBottomOfScreenVerticalAlignment,
         kPaddingFromEdgeOfLauncherVerticalAlignment));
   } else {
     set_border(views::Border::CreateEmptyBorder(0,
         kPaddingFromEdgeOfLauncherVerticalAlignment,
         kPaddingFromBottomOfScreenVerticalAlignment,
         kPaddingFromEdgeOfScreenVerticalAlignment));
   }
 }
 
 void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
-  if (alignment == shelf_alignment_)
+  if (alignment == shelf_alignment())
     return;
-  shelf_alignment_ = alignment;
+  internal::TrayBackgroundView::SetShelfAlignment(alignment);
   UpdateAfterShelfAlignmentChange(alignment);
   SetBorder();
   tray_container_->SetLayoutManager(new views::BoxLayout(
       alignment == SHELF_ALIGNMENT_BOTTOM ?
           views::BoxLayout::kHorizontal : views::BoxLayout::kVertical,
       0, 0, 0));
 }
 
 bool SystemTray::PerformAction(const views::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
@@ skipping 41 matching lines @@
 
 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // The tray itself expands to the right and bottom edge of the screen to make
   // sure clicking on the edges brings up the popup. However, the focus border
   // should be only around the container.
   if (GetWidget() && GetWidget()->IsActive())
     canvas->DrawFocusRect(tray_container_->bounds());
 }
 
 }  // namespace ash