Remove Shell::shelf()|status_area_widget()|launcher()

ash/screen_ash.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/screen_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
+#include "ash/wm/property_util.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
@@ skipping 12 matching lines @@
 ScreenAsh::~ScreenAsh() {
 }
 
 // static
 gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) {
   return GetDisplayManager()->FindDisplayContainingPoint(point);
 }
 
 // static
 gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
-  if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
-    return Shell::GetInstance()->shelf()->GetMaximizedWindowBounds(window);
+  if (GetRootWindowController(window->GetRootWindow())->launcher())
+    return GetDisplayWorkAreaBoundsInParent(window);
   else
     return GetDisplayBoundsInParent(window);
 }
 
 // static
 gfx::Rect ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
     aura::Window* window) {
-  if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
-    return Shell::GetInstance()->shelf()->GetUnmaximizedWorkAreaBounds(window);
-  else
-    return GetDisplayWorkAreaBoundsInParent(window);
+  return GetDisplayWorkAreaBoundsInParent(window);
 }

[oshima, 2012/10/17 15:26:41]

These two methods will be gone after
http://codereview.chromium.org/10979090.

 
 // static
 gfx::Rect ScreenAsh::GetDisplayBoundsInParent(aura::Window* window) {
   return ConvertRectFromScreen(
       window->parent(),
       Shell::GetScreen()->GetDisplayNearestWindow(window).bounds());
 }
 
 // static
 gfx::Rect ScreenAsh::GetDisplayWorkAreaBoundsInParent(aura::Window* window) {
@@ skipping 52 matching lines @@
 
 gfx::Display ScreenAsh::GetDisplayMatching(const gfx::Rect& match_rect) const {
   return GetDisplayManager()->GetDisplayMatching(match_rect);
 }
 
 gfx::Display ScreenAsh::GetPrimaryDisplay() const {
   return DisplayController::GetPrimaryDisplay();
 }
 
 }  // namespace ash