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

ash/root_window_controller.cc

Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index cabeb973f633b968ad71029048afd95c1e4e87ee..242936121813bf2403a96baab40b983c905b5397 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -164,6 +164,15 @@ RootWindowController::~RootWindowController() {
   root_window_.reset();
 }
 
+// static
+internal::RootWindowController*
+RootWindowController::ForLauncher(aura::Window* window) {
+  if (Shell::IsLauncherPerDisplayEnabled())
+    return GetRootWindowController(window->GetRootWindow());
+  else
+    return Shell::GetPrimaryRootWindowController();
+}
+
 void RootWindowController::Shutdown() {
   CloseChildWindows();
   if (Shell::GetActiveRootWindow() == root_window_.get()) {