Simplify WorkAreaBounds access logic

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 <algorithm>
 #include <cmath>
 
 #include "ash/ash_switches.h"
@@ skipping 477 matching lines @@
 void ShelfLayoutManager::OnWindowActivated(aura::Window* active,
                                            aura::Window* old_active) {
   UpdateAutoHideStateNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfLayoutManager, private:
 
 ShelfLayoutManager::TargetBounds::TargetBounds() : opacity(0.0f) {}
 
-gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds(
-    aura::Window* window) {
-  gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(window));
-  if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) {
-    AdjustBoundsBasedOnAlignment(kAutoHideSize, &bounds);
-    return bounds;
-  }
-  // SHELF_AUTO_HIDE_BEHAVIOR_NEVER maximized windows don't get any taller.
-  return GetUnmaximizedWorkAreaBounds(window);
-}
-
-gfx::Rect ShelfLayoutManager::GetUnmaximizedWorkAreaBounds(
-    aura::Window* window) {
-  gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(window));
-  int size;
-  if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) {
-    size = kAutoHideSize;
-  } else {
-    int width, height;
-    GetShelfSize(&width, &height);
-    size = std::max(width, height);
-  }
-  AdjustBoundsBasedOnAlignment(size, &bounds);
-  return bounds;
-}
-
 void ShelfLayoutManager::SetState(VisibilityState visibility_state) {
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   State state;
   state.visibility_state = visibility_state;
   state.auto_hide_state = CalculateAutoHideState(visibility_state);
   state.is_screen_locked = delegate && delegate->IsScreenLocked();
 
   // It's possible for SetState() when a window becomes maximized but the state
   // won't have changed value. Do the dimming check before the early exit.
   if (launcher_ && workspace_controller_) {
@@ skipping 386 matching lines @@
 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
   if (state.visibility_state == VISIBLE)
     return size;
   if (state.visibility_state == AUTO_HIDE)
     return kAutoHideSize;
   return 0;
 }
 
 }  // namespace internal
 }  // namespace ash