Nix GetRootWindowController, use RootWindowController::ForWindow.

ash/screen_util.cc

 // Copyright 2014 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/screen_util.h"
 
-#include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 // static
 gfx::Rect ScreenUtil::GetMaximizedWindowBoundsInParent(aura::Window* window) {
-  aura::Window* root_window = window->GetRootWindow();
-  if (GetRootWindowController(root_window)->shelf()->shelf_widget())
+  if (Shelf::ForWindow(window)->shelf_widget())
     return GetDisplayWorkAreaBoundsInParent(window);
   return GetDisplayBoundsInParent(window);
 }
 
 // static
 gfx::Rect ScreenUtil::GetDisplayBoundsInParent(aura::Window* window) {
   gfx::Rect result =
       display::Screen::GetScreen()->GetDisplayNearestWindow(window).bounds();
   ::wm::ConvertRectFromScreen(window->parent(), &result);
   return result;
@@ skipping 22 matching lines @@
     gfx::SizeF size(ShellPort::Get()->GetFirstDisplay().size());
     float scale = window->GetRootWindow()->bounds().height() / size.height();
     size.Scale(scale, scale);
     return gfx::Rect(gfx::ToCeiledSize(size));
   }
 
   return window->GetRootWindow()->bounds();
 }
 
 }  // namespace ash