Refactor: Shelf Widget

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index b9e12bb24763e2f3170ee0a4676d4e29db8d4f5a..931f0fc3d16a7b3c8a3e8ad55c984e41f557cad5 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -25,6 +25,7 @@
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation.h"
 #include "ash/screenshot_delegate.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ -606,7 +607,7 @@ bool AcceleratorController::PerformAction(int action,
       break;
     case FOCUS_LAUNCHER:
       return shell->focus_cycler()->FocusWidget(
-          Launcher::ForPrimaryDisplay()->widget());
+          Launcher::ForPrimaryDisplay()->shelf_widget());
       break;
     case FOCUS_NEXT_PANE:
       return HandleRotatePaneFocus(Shell::FORWARD);
@@ -637,7 +638,7 @@ bool AcceleratorController::PerformAction(int action,
           internal::RootWindowController::ForActiveRootWindow() :
           Shell::GetPrimaryRootWindowController();
       internal::StatusAreaWidget* status_area_widget =
-          controller->status_area_widget();
+          controller->shelf()->status_area_widget();
       if (status_area_widget) {
         WebNotificationTray* notification_tray =
             status_area_widget->web_notification_tray();