Stop using shell::GetInstance()->system_tray() in system tray items

ash/system/tray/system_tray_bubble.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_bubble.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/message_loop.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
-#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 using views::TrayBubbleView;
 
 namespace ash {
 
 namespace {
 
 // Normally a detailed view is the same size as the default view. However,
 // when showing a detailed view directly (e.g. clicking on a notification),
 // we may not know the height of the default view, or the default view may
 // be too short, so we use this as a default and minimum height for any
 // detailed view.
 const int kDetailedBubbleMaxHeight = kTrayPopupItemHeight * 5;
 
 // A view with some special behaviour for tray items in the popup:
 // - optionally changes background color on hover.
 class TrayPopupItemContainer : public views::View {
  public:
   TrayPopupItemContainer(views::View* view,
                          ShelfAlignment alignment,
                          bool change_background)
       : hover_(false),
         change_background_(change_background) {
     set_notify_enter_exit_on_child(true);
-    views::BoxLayout* layout = new views::BoxLayout(
-        views::BoxLayout::kVertical, 0, 0, 0);
-    layout->set_spread_blank_space(true);
-    SetLayoutManager(layout);
+    SetLayoutManager(new views::FillLayout);
     SetPaintToLayer(view->layer() != NULL);
     if (view->layer())
       SetFillsBoundsOpaquely(view->layer()->fills_bounds_opaquely());
     AddChildView(view);
     SetVisible(view->visible());
   }
 
   virtual ~TrayPopupItemContainer() {}
 
  private:
@@ skipping 250 matching lines @@
   for (std::vector<ash::SystemTrayItem*>::const_iterator it = items_.begin();
        it != items_.end();
        ++it) {
     if ((*it)->ShouldShowLauncher())
       return true;
   }
   return false;
 }
 
 void SystemTrayBubble::CreateItemViews(user::LoginStatus login_status) {
+  const int bubble_width = bubble_view_->GetPreferredSize().width();
   for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end();
        ++it) {
     views::View* view = NULL;
     switch (bubble_type_) {
       case BUBBLE_TYPE_DEFAULT:
-        view = (*it)->CreateDefaultView(login_status);
+        view = (*it)->CreateDefaultView(login_status, bubble_width);
         break;
       case BUBBLE_TYPE_DETAILED:
         view = (*it)->CreateDetailedView(login_status);
         break;
       case BUBBLE_TYPE_NOTIFICATION:
         view = (*it)->CreateNotificationView(login_status);
         break;
     }
     if (view) {
       bubble_view_->AddChildView(new TrayPopupItemContainer(
           view, tray_->shelf_alignment(), bubble_type_ == BUBBLE_TYPE_DEFAULT));
+      if (bubble_type_ == BUBBLE_TYPE_DEFAULT &&
+          (*it)->GuaranteeDefaultViewPreferredSize(login_status)) {
+        bubble_view_->SetMinWidth(view->GetPreferredSize().width());
+      }
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash