Refactor: Shelf Widget

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #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/system_modal_container_event_filter_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/base/events/event_target.h"
 #include "ui/gfx/insets.h"
@@ skipping 410 matching lines @@
   }
   internal::DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
 #endif  // defined(OS_CHROMEOS)
 
   RootWindowHostFactory* root_window_host_factory() {
     return root_window_host_factory_.get();
   }
 
+  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);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
   friend class internal::RootWindowController;
   friend class test::ShellTestApi;
   friend class shell::WindowWatcher;
 
   typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
 
   explicit Shell(ShellDelegate* delegate);
   virtual ~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);
 
   // Initializes the layout managers and event filters specific for
   // primary display.
   void InitLayoutManagersForPrimaryDisplay(
       internal::RootWindowController* root_window_controller);
 
   // ash::internal::SystemModalContainerEventFilterDelegate overrides:
@@ skipping 119 matching lines @@
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_