diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 20:26:47 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 20:26:47 +0000 |
| commit | 6377a003e5948a14cf79bf6433e4c89dbc9354e0 (patch) | |
| tree | b84cc5488c90e4b3ef85bba3f61a7613a2d4579d /ui/aura_shell/launcher/launcher.cc | |
| parent | 90c5032fb8beef603812ac47769184ae526abaf8 (diff) | |
| download | chromium_src-6377a003e5948a14cf79bf6433e4c89dbc9354e0.zip chromium_src-6377a003e5948a14cf79bf6433e4c89dbc9354e0.tar.gz chromium_src-6377a003e5948a14cf79bf6433e4c89dbc9354e0.tar.bz2 | |
Rid the world of TopLevelWindowContainer, and "toplevel" concept from Window entirely.
- Creates StackingController in aura_shell to manage stacking and implement aura::StackingClient.
- Moves DesktopEventFilter to shell, since it's mostly shell-related anyway.
- Move relevant tests to shell, requiring some refactoring to move test utils around.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8505049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/launcher/launcher.cc')
| -rw-r--r-- | ui/aura_shell/launcher/launcher.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura_shell/launcher/launcher.cc b/ui/aura_shell/launcher/launcher.cc index 8459656..a10e485 100644 --- a/ui/aura_shell/launcher/launcher.cc +++ b/ui/aura_shell/launcher/launcher.cc @@ -4,7 +4,7 @@ #include "ui/aura_shell/launcher/launcher.h" -#include "ui/aura/toplevel_window_container.h" +#include "ui/aura/window.h" #include "ui/aura_shell/launcher/launcher_model.h" #include "ui/aura_shell/launcher/launcher_view.h" #include "ui/aura_shell/shell.h" @@ -15,7 +15,7 @@ namespace aura_shell { -Launcher::Launcher(aura::ToplevelWindowContainer* window_container) +Launcher::Launcher(aura::Window* window_container) : widget_(NULL), window_container_(window_container) { window_container->AddObserver(this); |