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

ash/system/user/tray_user.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/user/tray_user.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
@@ skipping 253 matching lines @@
     label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
     SetupLabelForTray(label_);
   } else {
     avatar_ = new tray::RoundedImageView(kProfileRoundedCornerRadius);
   }
   UpdateAfterLoginStatusChange(status);
   return avatar_ ? static_cast<views::View*>(avatar_)
                  : static_cast<views::View*>(label_);
 }
 
-views::View* TrayUser::CreateDefaultView(user::LoginStatus status) {
+views::View* TrayUser::CreateDefaultView(user::LoginStatus status,
+                                         int bubble_width) {
   if (status == user::LOGGED_IN_NONE)
     return NULL;
 
   CHECK(user_ == NULL);
   user_ = new tray::UserView(status);
   return user_;
 }
 
 views::View* TrayUser::CreateDetailedView(user::LoginStatus status) {
   return NULL;
@@ skipping 62 matching lines @@
   // Check for null to avoid crbug.com/150944.
   if (avatar_) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
 
 }  // namespace internal
 }  // namespace ash