Aura/Ash split: Move ScreenAura to ash::ScreenAsh.

ash/wm/base_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/base_layout_manager.h"
 
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace internal {
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, public:
 
 BaseLayoutManager::BaseLayoutManager() {
+  Shell::GetInstance()->AddShellObserver(this);
   Shell::GetRootWindow()->AddRootWindowObserver(this);
 }
 
 BaseLayoutManager::~BaseLayoutManager() {
   for (WindowSet::const_iterator i = windows_.begin(); i != windows_.end(); ++i)
     (*i)->RemoveObserver(this);
   Shell::GetRootWindow()->RemoveRootWindowObserver(this);
+  Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, LayoutManager overrides:
 
 void BaseLayoutManager::OnWindowResized() {
 }
 
 void BaseLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   windows_.insert(child);
@@ skipping 23 matching lines @@
   SetChildBoundsDirect(child, child_bounds);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, RootWindowObserver overrides:
 
 void BaseLayoutManager::OnRootWindowResized(const gfx::Size& new_size) {
   AdjustWindowSizesForScreenChange();
 }
 
+/////////////////////////////////////////////////////////////////////////////
+// BaseLayoutManager, ash::ShellObserver overrides:
+
 void BaseLayoutManager::OnScreenWorkAreaInsetsChanged() {
   AdjustWindowSizesForScreenChange();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, WindowObserver overrides:
 
 void BaseLayoutManager::OnWindowPropertyChanged(aura::Window* window,
                                                 const void* key,
                                                 intptr_t old) {
@@ skipping 43 matching lines @@
     gfx::Rect monitor_rect = wm::IsWindowFullscreen(window) ?
         gfx::Screen::GetMonitorAreaNearestWindow(window) :
         gfx::Screen::GetMonitorWorkAreaNearestWindow(window);
     // Put as much of the window as possible within the monitor area.
     window->SetBounds(window->bounds().AdjustToFit(monitor_rect));
   }
 }
 
 }  // namespace internal
 }  // namespace ash