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

ash/system/settings/tray_settings.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/settings/tray_settings.h"
 
 #include "ash/shell.h"
 #include "ash/system/power/power_status_view.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 106 matching lines @@
 TraySettings::TraySettings()
     : default_view_(NULL) {
 }
 
 TraySettings::~TraySettings() {}
 
 views::View* TraySettings::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
-views::View* TraySettings::CreateDefaultView(user::LoginStatus status) {
+views::View* TraySettings::CreateDefaultView(user::LoginStatus status,
+                                             int bubble_width) {
   if ((status == user::LOGGED_IN_NONE || status == user::LOGGED_IN_LOCKED) &&
       (!ash::Shell::GetInstance()->tray_delegate()->
           GetPowerSupplyStatus().battery_is_present))
     return NULL;
 
   CHECK(default_view_ == NULL);
   default_view_ =  new tray::SettingsDefaultView(status);
   return default_view_;
 }
 
@@ skipping 16 matching lines @@
 }
 
 // Overridden from PowerStatusObserver.
 void TraySettings::OnPowerStatusChanged(const PowerSupplyStatus& status) {
   if (default_view_)
     default_view_->UpdatePowerStatus(status);
 }
 
 }  // namespace internal
 }  // namespace ash