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

ash/wm/shelf_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/shelf_layout_manager.h"
 
 #include "ash/launcher/launcher.h"
+#include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "base/auto_reset.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/screen_aura.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
@@ skipping 16 matching lines @@
       max_height_(-1),
       launcher_(launcher),
       status_(status) {
   gfx::Rect launcher_bounds = launcher->GetWindowScreenBounds();
   gfx::Rect status_bounds = status->GetWindowScreenBounds();
   max_height_ = std::max(launcher_bounds.height(), status_bounds.height());
 }
 
 ShelfLayoutManager::~ShelfLayoutManager() {
   // Without a shelf we don't need special insets anymore.
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(gfx::Insets());
+  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets());
 }
 
 void ShelfLayoutManager::LayoutShelf() {
   AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
   StopAnimating();
   TargetBounds target_bounds;
   float target_opacity = visible_ ? 1.0f : 0.0f;
   CalculateTargetBounds(visible_, &target_bounds);
   GetLayer(launcher_)->SetOpacity(target_opacity);
   GetLayer(status_)->SetOpacity(target_opacity);
   launcher_->SetBounds(target_bounds.launcher_bounds);
   status_->SetBounds(target_bounds.status_bounds);
   Shell::GetInstance()->launcher()->SetStatusWidth(
       target_bounds.status_bounds.width());
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
+  Shell::GetInstance()->SetScreenWorkAreaInsets(
       target_bounds.work_area_insets);
 }
 
 void ShelfLayoutManager::SetVisible(bool visible) {
   ui::Layer* launcher_layer = GetLayer(launcher_);
   ui::Layer* status_layer = GetLayer(status_);
 
   // TODO(vollick): once visibility is animatable, use GetTargetVisibility.
   bool current_visibility = visible_ &&
       launcher_layer->GetTargetOpacity() > 0.0f &&
@@ skipping 70 matching lines @@
       available_bounds.x(), y + (max_height_ - launcher_bounds.height()) / 2,
       available_bounds.width(),
       launcher_bounds.height());
   if (visible)
     target_bounds->work_area_insets = gfx::Insets(0, 0, max_height_, 0);
 }
 
 void ShelfLayoutManager::OnImplicitAnimationsCompleted() {
   TargetBounds target_bounds;
   CalculateTargetBounds(visible_, &target_bounds);
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
+  Shell::GetInstance()->SetScreenWorkAreaInsets(
       target_bounds.work_area_insets);
 }
 
 }  // namespace internal
 }  // namespace ash