mash: Move more shelf files to ash/common/shelf.

ash/common/shelf/shelf_widget.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_SHELF_SHELF_WIDGET_H_
-#define ASH_SHELF_SHELF_WIDGET_H_
+#ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_
+#define ASH_COMMON_SHELF_SHELF_WIDGET_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_background_animator.h"
 #include "ash/common/shelf/shelf_background_animator_observer.h"
+#include "ash/common/shelf/shelf_layout_manager_observer.h"
 #include "ash/common/shelf/shelf_types.h"
-#include "ash/shelf/shelf_layout_manager_observer.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace ash {
 class FocusCycler;
 class Shelf;
 class ShelfLayoutManager;
 class ShelfView;
 class StatusAreaWidget;
@@ skipping 103 matching lines @@
   // View containing the shelf items. Owned by the views hierarchy.
   ShelfView* shelf_view_;
   ShelfBackgroundAnimator background_animator_;
   bool activating_as_fallback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SHELF_SHELF_WIDGET_H_
+#endif  // ASH_COMMON_SHELF_SHELF_WIDGET_H_