Moves ash/wm/common back into ash

ash/wm/common/workspace/workspace_layout_manager.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_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 #define ASH_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <set>
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "ash/wm/common/window_state_observer.h"
 #include "ash/wm/common/wm_activation_observer.h"
 #include "ash/wm/common/wm_layout_manager.h"
 #include "ash/wm/common/wm_root_window_controller_observer.h"
 #include "ash/wm/common/wm_types.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace ash {
 class WorkspaceLayoutManagerBackdropDelegate;
 
 namespace wm {
 class WmGlobals;
 class WmRootWindowController;
 class WorkspaceLayoutManagerDelegate;
 class WMEvent;
 }
 
 // LayoutManager used on the window created for a workspace.
-class ASH_WM_COMMON_EXPORT WorkspaceLayoutManager
+class ASH_EXPORT WorkspaceLayoutManager
     : public wm::WmLayoutManager,
       public wm::WmWindowObserver,
       public wm::WmActivationObserver,
       public keyboard::KeyboardControllerObserver,
       public wm::WmRootWindowControllerObserver,
       public wm::WindowStateObserver {
  public:
   WorkspaceLayoutManager(
       wm::WmWindow* window,
       std::unique_ptr<wm::WorkspaceLayoutManagerDelegate> delegate);
@@ skipping 95 matching lines @@
   // A window which covers the full container and which gets inserted behind the
   // topmost visible window.
   std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> backdrop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_