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

ash/wm/app_list_controller.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/wm/app_list_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 97 matching lines @@
 }
 
 void AppListController::SetVisible(bool visible) {
   if (visible == is_visible_)
     return;
 
   is_visible_ = visible;
 
   // App list needs to know the new shelf layout in order to calculate its
   // UI layout when AppListView visibility changes.
-  Shell::GetInstance()->shelf()->UpdateAutoHideState();
+  Shell::GetPrimaryRootWindowController()->shelf()->UpdateAutoHideState();
 
   if (view_) {
     ScheduleAnimation();
   } else if (is_visible_) {
     // AppListModel and AppListViewDelegate are owned by AppListView. They
     // will be released with AppListView on close.
     app_list::AppListView* view = new app_list::AppListView(
         Shell::GetInstance()->delegate()->CreateAppListViewDelegate());
     view->InitAsBubble(
         Shell::GetPrimaryRootWindowController()->GetContainer(
             kShellWindowId_AppListContainer),
         pagination_model_.get(),
-        Shell::GetInstance()->launcher()->GetAppListButtonView(),
+        Launcher::ForWindow(GetWindow())->GetAppListButtonView(),
         gfx::Point(),
         GetBubbleArrowLocation());
     SetView(view);
   }
 }
 
 bool AppListController::IsVisible() const {
   return view_ && view_->GetWidget()->IsVisible();
 }
 
 aura::Window* AppListController::GetWindow() {
   return is_visible_ && view_ ? view_->GetWidget()->GetNativeWindow() : NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListController, private:
 
 void AppListController::SetView(app_list::AppListView* view) {
   DCHECK(view_ == NULL);
 
   if (is_visible_) {
     view_ = view;
     views::Widget* widget = view_->GetWidget();
     widget->AddObserver(this);
     Shell::GetInstance()->AddEnvEventFilter(this);
-    Shell::GetInstance()->launcher()->AddIconObserver(this);
+    Launcher::ForWindow(GetWindow())->AddIconObserver(this);
     widget->GetNativeView()->GetRootWindow()->AddRootWindowObserver(this);
     widget->GetNativeView()->GetFocusManager()->AddObserver(this);
     widget->SetOpacity(0);
     ScheduleAnimation();
 
     view_->GetWidget()->Show();
   } else {
     view->GetWidget()->Close();
   }
 }
 
 void AppListController::ResetView() {
   if (!view_)
     return;
 
   views::Widget* widget = view_->GetWidget();
   widget->RemoveObserver(this);
   GetLayer(widget)->GetAnimator()->RemoveObserver(this);
   Shell::GetInstance()->RemoveEnvEventFilter(this);
-  Shell::GetInstance()->launcher()->RemoveIconObserver(this);
+  Launcher::ForWindow(GetWindow())->RemoveIconObserver(this);
   widget->GetNativeView()->GetRootWindow()->RemoveRootWindowObserver(this);
   widget->GetNativeView()->GetFocusManager()->RemoveObserver(this);
   view_ = NULL;
 }
 
 void AppListController::ScheduleAnimation() {
   // Stop observing previous animation.
   StopObservingImplicitAnimations();
 
   views::Widget* widget = view_->GetWidget();
@@ skipping 168 matching lines @@
     should_snap_back_ = false;
     ui::ScopedLayerAnimationSettings animation(GetLayer(widget)->GetAnimator());
     animation.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(kSnapBackAnimationDurationMs));
     widget->SetBounds(view_bounds_);
   }
 }
 
 }  // namespace internal
 }  // namespace ash