Nix GetRootWindowController, use RootWindowController::ForWindow.

ash/app_list/app_list_presenter_delegate.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/app_list/app_list_presenter_delegate.h"
 
 #include "ash/ash_switches.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ skipping 71 matching lines @@
 
 app_list::AppListViewDelegate* AppListPresenterDelegate::GetViewDelegate() {
   return view_delegate_factory_->GetDelegate();
 }
 
 void AppListPresenterDelegate::Init(app_list::AppListView* view,
                                     int64_t display_id,
                                     int current_apps_page) {
   // App list needs to know the new shelf layout in order to calculate its
   // UI layout when AppListView visibility changes.
-  ash::Shell::GetPrimaryRootWindowController()
+  Shell::GetPrimaryRootWindowController()
       ->GetShelfLayoutManager()
       ->UpdateAutoHideState();
   view_ = view;
   aura::Window* root_window =
       ShellPort::Get()->GetRootWindowForDisplayId(display_id);
-  aura::Window* container = GetRootWindowController(root_window)
+  aura::Window* container = RootWindowController::ForWindow(root_window)
                                 ->GetContainer(kShellWindowId_AppListContainer);
 
   view->Initialize(container, current_apps_page);
 
   if (!app_list::features::IsFullscreenAppListEnabled()) {
     view->MaybeSetAnchorPoint(GetCenterOfDisplayForWindow(
         root_window, GetMinimumBoundsHeightForAppList(view)));
   }
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
@@ skipping 69 matching lines @@
 
 void AppListPresenterDelegate::ProcessLocatedEvent(ui::LocatedEvent* event) {
   if (!view_ || !is_visible_)
     return;
 
   // If the event happened on a menu, then the event should not close the app
   // list.
   aura::Window* target = static_cast<aura::Window*>(event->target());
   if (target) {
     RootWindowController* root_controller =
-        GetRootWindowController(target->GetRootWindow());
+        RootWindowController::ForWindow(target);
     if (root_controller) {
       aura::Window* menu_container =
           root_controller->GetContainer(kShellWindowId_MenuContainer);
       if (menu_container->Contains(target))
         return;
       aura::Window* keyboard_container = root_controller->GetContainer(
           kShellWindowId_VirtualKeyboardContainer);
       if (keyboard_container->Contains(target))
         return;
     }
@@ skipping 31 matching lines @@
 void AppListPresenterDelegate::OnKeyboardClosed() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterDelegate, ShellObserver implementation:
 void AppListPresenterDelegate::OnOverviewModeStarting() {
   if (is_visible_)
     presenter_->Dismiss();
 }
 
 }  // namespace ash