mash: Remove WorkspaceLayoutManagerDelegate.

ash/common/wm/workspace/workspace_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/common/wm/workspace/workspace_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/fullscreen_window_finder.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
-#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "base/command_line.h"
 #include "ui/compositor/layer.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace ash {
 
-WorkspaceLayoutManager::WorkspaceLayoutManager(
-    WmWindow* window,
-    std::unique_ptr<wm::WorkspaceLayoutManagerDelegate> delegate)
+WorkspaceLayoutManager::WorkspaceLayoutManager(WmWindow* window)
     : window_(window),
       root_window_(window->GetRootWindow()),
       root_window_controller_(root_window_->GetRootWindowController()),
       shell_(window_->GetShell()),
-      delegate_(std::move(delegate)),
       work_area_in_parent_(wm::GetDisplayWorkAreaBounds(window_)),
       is_fullscreen_(wm::GetWindowForFullscreenMode(window) != nullptr) {
   shell_->AddShellObserver(this);
   shell_->AddActivationObserver(this);
   root_window_->AddObserver(this);
   root_window_controller_->AddObserver(this);
   DCHECK(window->GetBoolProperty(
       WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY));
 }
 
 WorkspaceLayoutManager::~WorkspaceLayoutManager() {
   if (root_window_)
     root_window_->RemoveObserver(this);
   for (WmWindow* window : windows_) {
     wm::WindowState* window_state = window->GetWindowState();
     window_state->RemoveObserver(this);
     window->RemoveObserver(this);
   }
   root_window_->GetRootWindowController()->RemoveObserver(this);
   shell_->RemoveActivationObserver(this);
   shell_->RemoveShellObserver(this);
 }
 
-void WorkspaceLayoutManager::DeleteDelegate() {
-  delegate_.reset();
-}
-
 void WorkspaceLayoutManager::SetMaximizeBackdropDelegate(
     std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
   backdrop_delegate_.reset(delegate.release());
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, aura::LayoutManager implementation:
 
 void WorkspaceLayoutManager::OnWindowResized() {}
 
@@ skipping 263 matching lines @@
   // If a user plugs an external display into a laptop running Aura the
   // display size will change.  Maximized windows need to resize to match.
   // We also do this when developers running Aura on a desktop manually resize
   // the host window.
   // We also need to do this when the work area insets changes.
   for (WmWindow* window : windows_)
     window->GetWindowState()->OnWMEvent(event);
 }
 
 void WorkspaceLayoutManager::UpdateShelfVisibility() {
-  if (delegate_)
-    delegate_->UpdateShelfVisibility();
+  if (root_window_controller_->GetShelf())

[James Cook, 2016/08/10 19:55:41]

Maybe this should be HasShelf()? I'm not sure. It might be possible for this to
return a WmShelf* before the ShelfWidget is constructed.

[msw, 2016/08/10 20:47:40]

Done.

+    root_window_controller_->GetShelf()->UpdateVisibilityState();
 }
 
 void WorkspaceLayoutManager::UpdateFullscreenState() {
   // TODO(flackr): The fullscreen state is currently tracked per workspace
   // but the shell notification implies a per root window state. Currently
   // only windows in the default workspace container will go fullscreen but
   // this should really be tracked by the RootWindowController since
   // technically any container could get a fullscreen window.
-  if (!delegate_)
-    return;
   bool is_fullscreen = wm::GetWindowForFullscreenMode(window_) != nullptr;
   if (is_fullscreen != is_fullscreen_) {
-    delegate_->OnFullscreenStateChanged(is_fullscreen);
+    WmShell::Get()->NotifyFullscreenStateChanged(is_fullscreen, root_window_);
     is_fullscreen_ = is_fullscreen;
   }
 }
 
 void WorkspaceLayoutManager::UpdateAlwaysOnTop(WmWindow* window_on_top) {
   // Changing always on top state may change window's parent. Iterate on a copy
   // of |windows_| to avoid invalidating an iterator. Since both workspace and
   // always_on_top containers' layouts are managed by this class all the
   // appropriate windows will be included in the iteration.
   WindowSet windows(windows_);
   for (auto* window : windows) {
     wm::WindowState* window_state = window->GetWindowState();
     if (window_on_top)
       window_state->DisableAlwaysOnTop(window_on_top);
     else
       window_state->RestoreAlwaysOnTop();
   }
 }
 
 }  // namespace ash