Moves ash/wm/common back into ash

ash/wm/common/wm_root_window_controller.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_WM_ROOT_CONTROLLER_H_
 #define ASH_WM_COMMON_WM_ROOT_CONTROLLER_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "ash/wm/common/workspace/workspace_types.h"
 #include "ui/views/widget/widget.h"
 
 namespace gfx {
 class Point;
 }
 
 namespace ash {
 
 class AlwaysOnTopController;
 
 namespace wm {
 
 class WmGlobals;
 class WmRootWindowControllerObserver;
 class WmShelf;
 class WmWindow;
 
 // Provides state associated with a root of a window hierarchy.
-class ASH_WM_COMMON_EXPORT WmRootWindowController {
+class ASH_EXPORT WmRootWindowController {
  public:
   virtual ~WmRootWindowController() {}
 
   virtual bool HasShelf() = 0;
 
   virtual WmGlobals* GetGlobals() = 0;
 
   virtual WorkspaceWindowState GetWorkspaceWindowState() = 0;
 
   virtual AlwaysOnTopController* GetAlwaysOnTopController() = 0;
@@ skipping 18 matching lines @@
   virtual WmWindow* FindEventTarget(const gfx::Point& location_in_screen) = 0;
 
   virtual void AddObserver(WmRootWindowControllerObserver* observer) = 0;
   virtual void RemoveObserver(WmRootWindowControllerObserver* observer) = 0;
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WM_ROOT_CONTROLLER_H_