Moves ash/wm/common back into ash

ash/wm/common/panels/panel_layout_manager.h

Index: ash/wm/common/panels/panel_layout_manager.h
diff --git a/ash/wm/common/panels/panel_layout_manager.h b/ash/wm/common/panels/panel_layout_manager.h
index d5c8cadb5506f87077fb8328ce9d4f954252d743..c2bfa88babe35f83824746a7c326aea1d62adb86 100644
--- a/ash/wm/common/panels/panel_layout_manager.h
+++ b/ash/wm/common/panels/panel_layout_manager.h
@@ -8,7 +8,7 @@
 #include <list>
 #include <memory>
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "ash/wm/common/shelf/wm_shelf_observer.h"
 #include "ash/wm/common/window_state_observer.h"
 #include "ash/wm/common/wm_activation_observer.h"
@@ -55,7 +55,7 @@ class WmShelf;
 // its layout manager to this instance, e.g.:
 // panel_container->SetLayoutManager(new PanelLayoutManager(panel_container));
 
-class ASH_WM_COMMON_EXPORT PanelLayoutManager
+class ASH_EXPORT PanelLayoutManager
     : public wm::WmLayoutManager,
       public wm::WindowStateObserver,
       public wm::WmActivationObserver,
@@ -135,7 +135,7 @@ class ASH_WM_COMMON_EXPORT PanelLayoutManager
 
   views::Widget* CreateCalloutWidget();
 
-  struct ASH_WM_COMMON_EXPORT PanelInfo {
+  struct ASH_EXPORT PanelInfo {
     PanelInfo() : window(NULL), callout_widget(NULL), slide_in(false) {}
 
     bool operator==(const wm::WmWindow* other_window) const {