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

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 680 matching lines @@
 
 void Shell::OnAppTerminating() {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnAppTerminating());
 }
 
 void Shell::OnLockStateChanged(bool locked) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnLockStateChanged(locked));
 }
 
 void Shell::CreateLauncher() {
-  GetPrimaryRootWindowController()->CreateLauncher();
+  if (IsLauncherPerDisplayEnabled()) {
+    RootWindowControllerList controllers = GetAllRootWindowControllers();
+    for (RootWindowControllerList::iterator iter = controllers.begin();
+         iter != controllers.end(); ++iter)
+      (*iter)->CreateLauncher();
+  }  else {
+    GetPrimaryRootWindowController()->CreateLauncher();
+  }
 }
 
 void Shell::ShowLauncher() {
   GetPrimaryRootWindowController()->ShowLauncher();
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 62 matching lines @@
          iter != controllers.end(); ++iter)
       (*iter)->GetSystemModalLayoutManager(removed)->DestroyModalBackground();
   }
 }
 
 WebNotificationTray* Shell::GetWebNotificationTray() {
   return GetPrimaryRootWindowController()->status_area_widget()->
       web_notification_tray();
 }
 
-internal::StatusAreaWidget* Shell::status_area_widget() {
-  return GetPrimaryRootWindowController()->status_area_widget();
+bool Shell::HasPrimaryStatusArea() {
+  return !!GetPrimaryRootWindowController()->status_area_widget();
 }
 
-SystemTray* Shell::system_tray() {
-  // We assume in throughout the code that this will not return NULL. If code
-  // triggers this for valid reasons, it should test status_area_widget first.
-  internal::StatusAreaWidget* status_area = status_area_widget();
-  CHECK(status_area);
-  return status_area->system_tray();
+SystemTray* Shell::GetPrimarySystemTray() {
+  return GetPrimaryRootWindowController()->GetSystemTray();
 }
 
 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) {
   aura::client::SetFocusClient(root, focus_client_.get());
   internal::RootWindowController* controller =
       new internal::RootWindowController(root);
   controller->CreateContainers();
   // Pass false for the |is_first_run_after_boot| parameter so we'll show a
   // black background on this display instead of trying to mimic the boot splash
   // screen.
@@ skipping 98 matching lines @@
 
 void Shell::OnEvent(ui::Event* event) {
   if (event->type() ==
       views::corewm::FocusChangeEvent::activation_changed_event_type()) {
     active_root_window_ =
         static_cast<aura::Window*>(event->target())->GetRootWindow();
   }
 }
 
 }  // namespace ash