summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-04 03:20:01 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-04 03:20:01 +0000
commite9a71317209f27bb07ccd72d34e6c40e8469556f (patch)
treeaccfb9eda5029197dbd71d3a44f22e46b9015f21 /ash/shell.h
parent919b2f83216c7a9f07d2e3569ad74ab8c1a06675 (diff)
downloadchromium_src-e9a71317209f27bb07ccd72d34e6c40e8469556f.zip
chromium_src-e9a71317209f27bb07ccd72d34e6c40e8469556f.tar.gz
chromium_src-e9a71317209f27bb07ccd72d34e6c40e8469556f.tar.bz2
Move WindowPositioner to ash/wm
WindowPositioner doesn't depend on chrome at all. window_positioner_unittest remains c/b/ui/ash as it depends on browser. I'll add separate tests in ash for this. BUG=272460 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/25852004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/ash/shell.h b/ash/shell.h
index ed007b9..74c6311 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -97,6 +97,7 @@ class UserWallpaperDelegate;
class VideoDetector;
class WebNotificationTray;
class WindowCycleController;
+class WindowPositioner;
class WindowSelectorController;
namespace internal {
@@ -120,7 +121,6 @@ class OverlayEventFilter;
class ResizeShadowController;
class ResolutionNotificationController;
class RootWindowController;
-class RootWindowLayoutManager;
class ScopedTargetRootWindow;
class ScreenPositionController;
class SlowAnimationEventFilter;
@@ -473,6 +473,10 @@ class ASH_EXPORT Shell
return launcher_model_.get();
}
+ WindowPositioner* window_positioner() {
+ return window_positioner_.get();
+ }
+
// Returns the launcher delegate, creating if necesary.
LauncherDelegate* GetLauncherDelegate();
@@ -551,6 +555,7 @@ class ASH_EXPORT Shell
app_list_shelf_item_delegate_;
scoped_ptr<LauncherModel> launcher_model_;
+ scoped_ptr<ash::WindowPositioner> window_positioner_;
scoped_ptr<internal::AppListController> app_list_controller_;