[Launcher per display] Removed Shell::status_area_widget(), system_tray()

chrome/browser/chromeos/login/webui_login_view.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 "chrome/browser/chromeos/login/webui_login_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 124 matching lines @@
       kAccelNameVersion;
   accel_map_[ui::Accelerator(ui::VKEY_R,
       ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
       kAccelNameReset;
 
   for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
     AddAccelerator(i->first);
 }
 
 WebUILoginView::~WebUILoginView() {
-  if (ash::Shell::GetInstance()->status_area_widget())
-    ash::Shell::GetInstance()->system_tray()->SetNextFocusableView(NULL);
+  if (ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
+    ash::Shell::GetInstance()->GetPrimarySystemTray()->
+        SetNextFocusableView(NULL);
+  }
 }
 
 void WebUILoginView::Init(views::Widget* login_window) {
   login_window_ = login_window;
   webui_login_ = new views::WebView(ProfileManager::GetDefaultProfile());
   AddChildView(webui_login_);
 
   WebContents* web_contents = webui_login_->GetWebContents();
 
   // Create the password manager that is needed for the proxy.
@@ skipping 78 matching lines @@
       new ProxySettingsDialog(NULL, GetNativeWindow());
   dialog->Show();
 }
 
 void WebUILoginView::OnPostponedShow() {
   set_is_hidden(false);
   OnLoginPromptVisible();
 }
 
 void WebUILoginView::SetStatusAreaVisible(bool visible) {
-  if (ash::Shell::GetInstance()->status_area_widget()) {
-    ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray();
+  if (ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
+    ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
     if (visible) {
       // Tray may have been initialized being hidden.
       tray->SetVisible(visible);
       tray->GetWidget()->Show();
     } else {
       tray->GetWidget()->Hide();
     }
   }
 }
 
 void WebUILoginView::SetUIEnabled(bool enabled) {
   forward_keyboard_event_ = enabled;
-  ash::Shell::GetInstance()->system_tray()->SetEnabled(enabled);
+  ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(enabled);
 }
 
 // WebUILoginView protected: ---------------------------------------------------
 
 void WebUILoginView::Layout() {
   DCHECK(webui_login_);
   webui_login_->SetBoundsRect(bounds());
 }
 
 void WebUILoginView::OnLocaleChanged() {
@@ skipping 57 matching lines @@
     if (web_ui)
       web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
   }
 }
 
 bool WebUILoginView::IsPopupOrPanel(const WebContents* source) const {
   return true;
 }
 
 bool WebUILoginView::TakeFocus(content::WebContents* source, bool reverse) {
-  ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray();
+  ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
   if (tray && tray->GetWidget()->IsVisible()) {
     tray->SetNextFocusableView(this);
     ash::Shell::GetInstance()->RotateFocus(reverse ? ash::Shell::BACKWARD :
                                                      ash::Shell::FORWARD);
   }
 
   return true;
 }
 
 void WebUILoginView::RequestMediaAccessPermission(
@@ skipping 28 matching lines @@
   aura::Env::GetInstance()->set_render_white_bg(true);
 }
 
 void WebUILoginView::ReturnFocus(bool reverse) {
   // Return the focus to the web contents.
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 }  // namespace chromeos