Remove Shell::shelf()|status_area_widget()|launcher()

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 18 matching lines @@
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/capture_controller.h"
+#include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/event_rewriter_event_filter.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
@@ skipping 458 matching lines @@
   aura::Env::GetInstance()->RemovePreTargetHandler(filter);
 }
 
 void Shell::ShowContextMenu(const gfx::Point& location) {
   // No context menus if user have not logged in.
   if (!delegate_.get() || !delegate_->IsUserLoggedIn())
     return;
   // No context menus when screen is locked.
   if (IsScreenLocked())
     return;
-  if (launcher())
-    launcher()->ShowContextMenu(location);
+  aura::RootWindow* root =
+      wm::GetRootWindowMatching(gfx::Rect(location, gfx::Size()));
+  Launcher::ForWindow(root)->ShowContextMenu(location);
 }
 
 void Shell::ToggleAppList() {
   if (!app_list_controller_.get())
     app_list_controller_.reset(new internal::AppListController);
   app_list_controller_->SetVisible(!app_list_controller_->IsVisible());
 }
 
 bool Shell::GetAppListTargetVisibility() const {
   return app_list_controller_.get() &&
@@ skipping 43 matching lines @@
     return;
   FOR_EACH_OBSERVER(ShellObserver, observers_,
                     OnDisplayWorkAreaInsetsChanged());
 }
 
 void Shell::OnLoginStateChanged(user::LoginStatus status) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnLoginStateChanged(status));
   ash::Shell::GetInstance()->UpdateShelfVisibility();
 }
 
+void Shell::UpdateAfterLoginStatusChange(user::LoginStatus status) {
+  GetPrimaryRootWindowController()->status_area_widget()->
+      UpdateAfterLoginStatusChange(status);
+}
+
 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();
 }
 
 void Shell::ShowLauncher() {
   GetPrimaryRootWindowController()->ShowLauncher();
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-Launcher* Shell::launcher() {
-  return GetPrimaryRootWindowController()->launcher();
-}
-
 void Shell::UpdateShelfVisibility() {
+  // TODO(oshima): Update all root windows.
   GetPrimaryRootWindowController()->UpdateShelfVisibility();
 }
 
 void Shell::SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior) {
   GetPrimaryRootWindowController()->SetShelfAutoHideBehavior(behavior);
 }
 
 ShelfAutoHideBehavior Shell::GetShelfAutoHideBehavior() const {
   return GetPrimaryRootWindowController()->GetShelfAutoHideBehavior();
 }
@@ skipping 36 matching lines @@
   }
   if (!activated) {
     RemoveEnvEventFilter(modality_filter_.get());
     modality_filter_.reset();
     for (RootWindowControllerList::iterator iter = controllers.begin();
          iter != controllers.end(); ++iter)
       (*iter)->GetSystemModalLayoutManager(removed)->DestroyModalBackground();
   }
 }
 
-internal::ShelfLayoutManager* Shell::shelf() const {
-  return GetPrimaryRootWindowController()->shelf();
-}
-
-internal::StatusAreaWidget* Shell::status_area_widget() const {
-  return GetPrimaryRootWindowController()->status_area_widget();
+WebNotificationTray* Shell::GetWebNotificationTray() {
+  return GetPrimaryRootWindowController()->status_area_widget()->
+      web_notification_tray();
 }
 
 SystemTrayDelegate* Shell::tray_delegate() {
-  return status_area_widget() ? status_area_widget()->system_tray_delegate() :
-                                NULL;
+  // TODO(oshima): Decouple system tray and its delegate.
+  internal::StatusAreaWidget* status_area_widget =
+      GetPrimaryRootWindowController()->status_area_widget();
+  return status_area_widget ? status_area_widget->system_tray_delegate() : NULL;
 }
 
 SystemTray* Shell::system_tray() {
-  return status_area_widget() ? status_area_widget()->system_tray() :
-                                NULL;
+  internal::StatusAreaWidget* status_area_widget =
+      GetPrimaryRootWindowController()->status_area_widget();
+  return status_area_widget ? status_area_widget->system_tray() : NULL;
 }
 
 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) {
   root->set_focus_manager(focus_manager_.get());
   internal::RootWindowController* controller =
       new internal::RootWindowController(root);
   controller->CreateContainers();
   InitRootWindowController(controller);
   controller->root_window_layout()->OnWindowResized();
   desktop_background_controller_->OnRootWindowAdded(root);
@@ skipping 65 matching lines @@
        iter != controllers.end(); ++iter) {
     if ((*iter)->GetSystemModalLayoutManager(window)->
             CanWindowReceiveEvents(window)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ash