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

ash/shell/window_type_launcher.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/shell/window_type_launcher.h"
 
+#include "ash/root_window_controller.h"
 #include "ash/screensaver/screensaver_view.h"
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/wm/shadow_types.h"
@@ skipping 303 matching lines @@
   } else if (sender == show_hide_window_button_) {
     NonModalTransient::ToggleNonModalTransient(GetWidget()->GetNativeView());
   } else if (sender == show_screensaver_) {
     ash::ShowScreensaver(GURL("http://www.google.com"));
     content::BrowserThread::PostDelayedTask(content::BrowserThread::UI,
                                             FROM_HERE,
                                             base::Bind(&ash::CloseScreensaver),
                                             base::TimeDelta::FromSeconds(5));
 
   } else if (sender == show_web_notification_) {
-    ash::Shell::GetInstance()->status_area_widget()->
+    ash::Shell::GetPrimaryRootWindowController()->status_area_widget()->
         web_notification_tray()->AddNotification(
             "id0",
             ASCIIToUTF16("Test Shell Web Notification"),
             ASCIIToUTF16("Notification message body."),
             ASCIIToUTF16("www.testshell.org"),
             "" /* extension id */);
   }
 #if !defined(OS_MACOSX)
   else if (sender == examples_button_) {
     views::examples::ShowExamplesWindowWithContent(
@@ skipping 33 matching lines @@
   if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
         MenuItemView::TOPLEFT,
         MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
         MenuRunner::MENU_DELETED)
     return;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace shell
 }  // namespace ash