Moves ash/wm/common back into ash

ash/wm/common/panels/panel_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_PANELS_PANEL_LAYOUT_MANAGER_H_
 #define ASH_WM_COMMON_PANELS_PANEL_LAYOUT_MANAGER_H_
 
 #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"
 #include "ash/wm/common/wm_display_observer.h"
 #include "ash/wm/common/wm_layout_manager.h"
 #include "ash/wm/common/wm_overview_mode_observer.h"
 #include "ash/wm/common/wm_root_window_controller_observer.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "ash/wm/common/wm_window_tracker.h"
 #include "base/compiler_specific.h"
@@ skipping 26 matching lines @@
 
 // PanelLayoutManager is responsible for organizing panels within the
 // workspace. It is associated with a specific container window (i.e.
 // kShellWindowId_PanelContainer) and controls the layout of any windows
 // added to that container.
 //
 // The constructor takes a |panel_container| argument which is expected to set
 // 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,
       public wm::WmDisplayObserver,
       public wm::WmOverviewModeObserver,
       public wm::WmRootWindowControllerObserver,
       public wm::WmWindowObserver,
       public keyboard::KeyboardControllerObserver,
       public wm::WmShelfObserver {
  public:
@@ skipping 59 matching lines @@
  private:
   friend class PanelLayoutManagerTest;
   friend class PanelWindowResizerTest;
   friend class DockedWindowResizerTest;
   friend class DockedWindowLayoutManagerTest;
   friend class WorkspaceControllerTest;
   friend class AcceleratorControllerTest;
 
   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 {
       return window == other_window;
     }
 
     // Returns |callout_widget| as a widget. Used by tests.
     views::Widget* CalloutWidget();
 
     // A weak pointer to the panel window.
@@ skipping 55 matching lines @@
   // are currently focused.
   wm::WmWindow* last_active_panel_;
   base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_PANELS_PANEL_LAYOUT_MANAGER_H_