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

ash/common/shelf/shelf.h

 // Copyright 2013 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_H_
-#define ASH_SHELF_SHELF_H_
+#ifndef ASH_COMMON_SHELF_SHELF_H_
+#define ASH_COMMON_SHELF_SHELF_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_types.h"
-#include "ash/shelf/shelf_widget.h"
+#include "ash/common/shelf/shelf_widget.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class ApplicationDragAndDropHost;
 }
 
 namespace gfx {
 class Rect;
@@ skipping 23 matching lines @@
   ~Shelf();
 
   // Return the shelf for the primary display. NULL if no user is logged in yet.
   // Useful for tests. For production code use ForWindow() because the user may
   // have multiple displays.
   static Shelf* ForPrimaryDisplay();
 
   // Return the shelf for the display that |window| is currently on, or a shelf
   // on primary display if the shelf per display feature is disabled. NULL if no
   // user is logged in yet.
-  static Shelf* ForWindow(const WmWindow* window);
+  static Shelf* ForWindow(WmWindow* window);
 
   // DEPRECATED. Use WmShelf::GetAlignment() and SetAlignment().
   void SetAlignment(ShelfAlignment alignment);
   ShelfAlignment alignment() const { return alignment_; }
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
   // DEPRECATED. Use WmShelf::GetAutoHideBehavior() and SetAutoHideBehavior().
   void SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
@@ skipping 57 matching lines @@
   ShelfLockingManager shelf_locking_manager_;
 
   ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SHELF_SHELF_H_
+#endif  // ASH_COMMON_SHELF_SHELF_H_