Moves ash/wm/common back into ash

ash/wm/common/shelf/wm_shelf.h

 // Copyright 2016 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_WM_COMMON_SHELF_WM_SHELF_H_
 #define ASH_WM_COMMON_SHELF_WM_SHELF_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "ash/wm/common/shelf/wm_shelf_types.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
 namespace wm {
 
 class WmShelfObserver;
 class WmWindow;
 
 // Used for accessing global state.
-class ASH_WM_COMMON_EXPORT WmShelf {
+class ASH_EXPORT WmShelf {
  public:
   // Returns the window showing the shelf.
   virtual WmWindow* GetWindow() = 0;
 
   virtual ShelfAlignment GetAlignment() const = 0;
 
   virtual ShelfBackgroundType GetBackgroundType() const = 0;
 
   virtual void UpdateVisibilityState() = 0;
 
@@ skipping 10 matching lines @@
   virtual void RemoveObserver(WmShelfObserver* observer) = 0;
 
  protected:
   virtual ~WmShelf() {}
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_SHELF_WM_SHELF_H_