Refactor: Shelf Widget

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 168854feb58714d899119f4cef556fc1e8a3c9ab..c82f3d9479a58673a4aec208d4cf0f71b91ff2b0 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/shelf_types.h"
+#include "ash/shelf/shelf_types.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/cursor_manager.h"
 #include "ash/wm/system_modal_container_event_filter_delegate.h"
@@ -442,6 +442,13 @@ class ASH_EXPORT Shell
   // MessageCenter is a global list of currently displayed notifications.
   message_center::MessageCenter* message_center();
 
+  LauncherModel* launcher_model() {
+    return launcher_model_.get();
+  }
+
+  // Returns the launcher delegate, creating if necesary.
+  LauncherDelegate* GetLauncherDelegate();
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
@@ -457,13 +464,6 @@ class ASH_EXPORT Shell
 
   void Init();
 
-  LauncherModel* launcher_model() {
-    return launcher_model_.get();
-  }
-
-  // Returns the launcher delegate, creating if necesary.
-  LauncherDelegate* GetLauncherDelegate();
-
   // Initializes the root window and root window controller so that it
   // can host browser windows.
   void InitRootWindowController(internal::RootWindowController* root);