diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:09:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:09:17 +0000 |
| commit | 1a2145b860591d2e868ab98147ea4f162636d7eb (patch) | |
| tree | 26a65524e4698ffc4b76eeb3409bbd0fca2ae238 /ash/wm/base_layout_manager.h | |
| parent | 73238e09cc56e8b1b599ec978bec7bdd7a7730a8 (diff) | |
| download | chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.zip chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.tar.gz chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.tar.bz2 | |
Recommit r125950, which was reverted by r125958 due to link failures on win_aura bot.
Aura/Ash split: Move ScreenAura to aura::RootWindowScreen.
What is now aura::RootWindowScreen was tightly bundled with aura::RootWindow. Instead of moving it to ash::ScreenAsh, I renamed it aurea::RootWindowScreen because there's a bunch of unit tests that use RootWindow as if it were the desktop. Screen integration stuff has been moved out of RootWindow (and related observers) and into ash::Shell.
BUG=116458
First Review URL: http://codereview.chromium.org/9616045
Review URL: http://codereview.chromium.org/9696008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/base_layout_manager.h')
| -rw-r--r-- | ash/wm/base_layout_manager.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/wm/base_layout_manager.h b/ash/wm/base_layout_manager.h index 79fd1fe..df858c8 100644 --- a/ash/wm/base_layout_manager.h +++ b/ash/wm/base_layout_manager.h @@ -9,6 +9,7 @@ #include <set> #include "ash/ash_export.h" +#include "ash/shell_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/aura/layout_manager.h" @@ -29,6 +30,7 @@ namespace internal { // properly. class ASH_EXPORT BaseLayoutManager : public aura::LayoutManager, public aura::RootWindowObserver, + public ash::ShellObserver, public aura::WindowObserver { public: typedef std::set<aura::Window*> WindowSet; @@ -49,6 +51,8 @@ class ASH_EXPORT BaseLayoutManager : public aura::LayoutManager, // RootWindowObserver overrides: virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE; + + // ash::ShellObserver overrides: virtual void OnScreenWorkAreaInsetsChanged() OVERRIDE; // WindowObserver overrides: |