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

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 5a6736639a1689ed52ae92fcc8d34a3068352da1..66864e9b5e43d200a28f55f8f6925973c4551f44 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -633,10 +633,15 @@ bool AcceleratorController::PerformAction(int action,
         return true;
       }
       break;
-    case SHOW_SYSTEM_TRAY_BUBBLE:
-      if (!shell->system_tray()->HasSystemBubble())
-        shell->system_tray()->ShowDefaultView(BUBBLE_CREATE_NEW);
+    case SHOW_SYSTEM_TRAY_BUBBLE: {
+      internal::RootWindowController* controller =
+          Shell::IsLauncherPerDisplayEnabled() ?
+          internal::RootWindowController::ForActiveRootWindow() :
+          Shell::GetPrimaryRootWindowController();
+      if (!controller->GetSystemTray()->HasSystemBubble())
+        controller->GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
       break;
+    }
     case SHOW_TASK_MANAGER:
       Shell::GetInstance()->delegate()->ShowTaskManager();
       return true;