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 8640429b1f1f4e844de375f8c2eff692bc8cf86d..800db1dd5eb88297f85a0ad2fc67b1fd0d842e4e 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -161,6 +161,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()) {