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

ash/system/ime/tray_ime.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/ime/tray_ime.h"
 
 #include <vector>
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 251 matching lines @@
 }
 
 views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_label_ == NULL);
   tray_label_ = new TrayItemView;
   tray_label_->CreateLabel();
   SetupLabelForTray(tray_label_->label());
   return tray_label_;
 }
 
-views::View* TrayIME::CreateDefaultView(user::LoginStatus status) {
+views::View* TrayIME::CreateDefaultView(user::LoginStatus status,
+                                        int bubble_width) {
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
   IMEInfoList list;
   IMEPropertyInfoList property_list;
   delegate->GetAvailableIMEList(&list);
   delegate->GetCurrentIMEProperties(&property_list);
   if (list.size() <= 1 && property_list.size() <= 1)
     return NULL;
   CHECK(default_ == NULL);
   default_ = new tray::IMEDefaultView(this);
   return default_;
@@ skipping 59 matching lines @@
     } else if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() ||
                !message_shown_) {
       ShowNotificationView();
       message_shown_ = true;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash