diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
| commit | b65bdda36c548cd680eecbbfcfbd482b740e2eb3 (patch) | |
| tree | f904be7f7f8db20269dbe2c76b28e325ec04bd28 /ash/wm/workspace_controller.h | |
| parent | ff00968f75fd1a82532b0009f535310db5a9556c (diff) | |
| download | chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.zip chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.gz chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.bz2 | |
Move last few files -> ash
http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9036011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller.h')
| -rw-r--r-- | ash/wm/workspace_controller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h index a244e3e..771f5b9 100644 --- a/ash/wm/workspace_controller.h +++ b/ash/wm/workspace_controller.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/aura/root_window_observer.h" #include "ui/aura/window_observer.h" -#include "ui/aura_shell/aura_shell_export.h" +#include "ash/ash_export.h" namespace aura { class Window; @@ -32,7 +32,7 @@ class WorkspaceManager; // WorkspaceControlls owns a WorkspaceManager. WorkspaceControlls bridges // events From RootWindowObserver translating them to WorkspaceManager, and // a move event between Laucher and Workspace. -class AURA_SHELL_EXPORT WorkspaceController : +class ASH_EXPORT WorkspaceController : public aura::RootWindowObserver, public aura::WindowObserver, public aura_shell::internal::WorkspaceObserver, |