Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / wm / dock / docked_window_layout_manager.h

diff --git a/src/ash/wm/dock/docked_window_layout_manager.h b/src/ash/wm/dock/docked_window_layout_manager.h
index 18569d8..9a362a4 100644 (file)
--- a/src/ash/wm/dock/docked_window_layout_manager.h
+++ b/src/ash/wm/dock/docked_window_layout_manager.h
@@ -11,7 +11,6 @@
 #include "ash/wm/dock/dock_types.h"
 #include "ash/wm/dock/docked_window_layout_manager_observer.h"
 #include "ash/wm/window_state_observer.h"
-#include "ash/wm/workspace/snap_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
@@ -38,12 +37,10 @@ class Widget;
 }
 
 namespace ash {
-class Shelf;
-
-namespace internal {
 class DockedBackgroundWidget;
 class DockedWindowLayoutManagerObserver;
 class DockedWindowResizerTest;
+class Shelf;
 class ShelfLayoutManager;
 class WorkspaceController;
 
@@ -121,7 +118,7 @@ class ASH_EXPORT DockedWindowLayoutManager
 
   // Returns true when a window can be docked. Windows cannot be docked at the
   // edge used by the shelf or the edge opposite from existing dock.
-  bool CanDockWindow(aura::Window* window, SnapType edge);
+  bool CanDockWindow(aura::Window* window, DockedAlignment desired_alignment);
 
   aura::Window* dock_container() const { return dock_container_; }
 
@@ -310,7 +307,6 @@ class ASH_EXPORT DockedWindowLayoutManager
   DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_