Revert of Cros Tablet Window management - Split Screen part II

ash/wm/overview/window_grid.cc

 // Copyright 2014 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/overview/window_grid.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
@@ skipping 239 matching lines @@
 }
 
 bool IsMinimizedStateType(wm::WindowStateType type) {
   return type == wm::WINDOW_STATE_TYPE_MINIMIZED;
 }
 
 }  // namespace
 
 WindowGrid::WindowGrid(aura::Window* root_window,
                        const std::vector<aura::Window*>& windows,
-                       WindowSelector* window_selector,
-                       const gfx::Rect& bounds_in_screen)
+                       WindowSelector* window_selector)
     : root_window_(root_window),
       window_selector_(window_selector),
       window_observer_(this),
       window_state_observer_(this),
       selected_index_(0),
       num_columns_(0),
-      prepared_for_overview_(false),
-      bounds_(bounds_in_screen) {
+      prepared_for_overview_(false) {
   aura::Window::Windows windows_in_root;
   for (auto* window : windows) {
     if (window->GetRootWindow() == root_window)
       windows_in_root.push_back(window);
   }
 
   for (auto* window : windows_in_root) {
     window_observer_.Add(window);
     window_state_observer_.Add(wm::GetWindowState(window));
     window_list_.push_back(
-        base::MakeUnique<WindowSelectorItem>(window, window_selector_, this));
+        base::MakeUnique<WindowSelectorItem>(window, window_selector_));
   }
 }
 
 WindowGrid::~WindowGrid() {}
 
 void WindowGrid::Shutdown() {
   for (const auto& window : window_list_)
     window->Shutdown();
 
   if (shield_widget_) {
@@ skipping 30 matching lines @@
 }
 
 void WindowGrid::PositionWindows(bool animate) {
   if (window_selector_->is_shut_down() || window_list_.empty())
     return;
   DCHECK(shield_widget_.get());
   // Keep the background shield widget covering the whole screen.
   aura::Window* widget_window = shield_widget_->GetNativeWindow();
   const gfx::Rect bounds = widget_window->parent()->bounds();
   widget_window->SetBounds(bounds);
-
-  gfx::Rect total_bounds = bounds_;
+  gfx::Rect total_bounds = ScreenUtil::GetDisplayWorkAreaBoundsInParent(
+      root_window_->GetChildById(kShellWindowId_DefaultContainer));
+  ::wm::ConvertRectToScreen(root_window_, &total_bounds);
   // Windows occupy vertically centered area with additional vertical insets.
   int horizontal_inset =
       gfx::ToFlooredInt(std::min(kOverviewInsetRatio * total_bounds.width(),
                                  kOverviewInsetRatio * total_bounds.height()));
   int vertical_inset =
       horizontal_inset +
       kOverviewVerticalInset * (total_bounds.height() - 2 * horizontal_inset);
   total_bounds.Inset(std::max(0, horizontal_inset - kWindowMargin),
                      std::max(0, vertical_inset - kWindowMargin));
   std::vector<gfx::Rect> rects;
@@ skipping 169 matching lines @@
 }
 
 bool WindowGrid::Contains(const aura::Window* window) const {
   for (const auto& window_item : window_list_) {
     if (window_item->Contains(window))
       return true;
   }
   return false;
 }
 
-void WindowGrid::RemoveItem(WindowSelectorItem* selector_item) {
-  auto iter =
-      std::find_if(window_list_.begin(), window_list_.end(),
-                   [selector_item](std::unique_ptr<WindowSelectorItem>& item) {
-                     return (item.get() == selector_item);
-                   });
-  if (iter != window_list_.end()) {
-    window_observer_.Remove(selector_item->GetWindow());
-    window_state_observer_.Remove(
-        wm::GetWindowState(selector_item->GetWindow()));
-    window_list_.erase(iter);
-  }
-}
-
 void WindowGrid::FilterItems(const base::string16& pattern) {
   base::i18n::FixedPatternStringSearchIgnoringCaseAndAccents finder(pattern);
   for (const auto& window : window_list_) {
     if (finder.Search(window->GetWindow()->GetTitle(), nullptr, nullptr)) {
       window->SetDimmed(false);
     } else {
       window->SetDimmed(true);
       if (selection_widget_ && SelectedWindow() == window.get()) {
         SelectedWindow()->SetSelected(false);
         selection_widget_.reset();
         selector_shadow_.reset();
       }
     }
   }
 }
 
 void WindowGrid::WindowClosing(WindowSelectorItem* window) {
   if (!selection_widget_ || SelectedWindow() != window)
     return;
   aura::Window* selection_widget_window = selection_widget_->GetNativeWindow();
   ScopedOverviewAnimationSettings animation_settings_label(
       OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM,
       selection_widget_window);
   selection_widget_->SetOpacity(0.f);
 }
 
-void WindowGrid::SetBoundsAndUpdatePositions(const gfx::Rect& bounds) {
-  bounds_ = bounds;
-  PositionWindows(true /* animate */);
-}
-
 void WindowGrid::OnWindowDestroying(aura::Window* window) {
   window_observer_.Remove(window);
   window_state_observer_.Remove(wm::GetWindowState(window));
   auto iter = std::find_if(window_list_.begin(), window_list_.end(),
                            [window](std::unique_ptr<WindowSelectorItem>& item) {
                              return item->GetWindow() == window;
                            });
   DCHECK(iter != window_list_.end());
 
   size_t removed_index = iter - window_list_.begin();
@@ skipping 258 matching lines @@
         *min_right = left;
       if (*max_right < left)
         *max_right = left;
     }
     *max_bottom = top + height;
   }
   return windows_fit;
 }
 
 }  // namespace ash