mash: Remove WorkspaceLayoutManagerDelegate.

ash/mus/root_window_controller.cc

 // Copyright 2016 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/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/root_window_controller_common.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
-#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shelf_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screenlock_layout.h"
 #include "ash/mus/shelf_layout_manager.h"
 #include "ash/mus/status_layout_manager.h"
 #include "ash/mus/window_manager.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/cpp/window_tree_host_factory.h"
 
 using ash::mojom::Container;
 
 namespace ash {
 namespace mus {
-namespace {
-
-class WorkspaceLayoutManagerDelegateImpl
-    : public wm::WorkspaceLayoutManagerDelegate {
- public:
-  explicit WorkspaceLayoutManagerDelegateImpl(
-      WmRootWindowControllerMus* root_window_controller)
-      : root_window_controller_(root_window_controller) {}
-  ~WorkspaceLayoutManagerDelegateImpl() override = default;
-
-  // WorkspaceLayoutManagerDelegate:
-  void UpdateShelfVisibility() override { NOTIMPLEMENTED(); }
-  void OnFullscreenStateChanged(bool is_fullscreen) override {
-    // TODO(sky): this should only do something if there is a shelf, see
-    // implementation in ash/shell.cc.
-    NOTIMPLEMENTED();
-    root_window_controller_->NotifyFullscreenStateChange(is_fullscreen);
-  }
-
- private:
-  WmRootWindowControllerMus* root_window_controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerDelegateImpl);
-};
-
-}  // namespace
 
 RootWindowController::RootWindowController(WindowManager* window_manager,
                                            ui::Window* root,
                                            const display::Display& display)
     : window_manager_(window_manager),
       root_(root),
       window_count_(0),
       display_(display) {
   wm_root_window_controller_.reset(
       new WmRootWindowControllerMus(window_manager_->shell(), this));
@@ skipping 151 matching lines @@
 
   WmWindowMus* status_container =
       GetWindowByShellWindowId(kShellWindowId_StatusContainer);
   layout_managers_[status_container->mus_window()].reset(
       new StatusLayoutManager(status_container->mus_window()));
 
   WmWindowMus* default_container =
       GetWindowByShellWindowId(kShellWindowId_DefaultContainer);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a
   // wm::LayoutManager), so it can't be in |layout_managers_|.
-  std::unique_ptr<WorkspaceLayoutManagerDelegateImpl>
-      workspace_layout_manager_delegate(new WorkspaceLayoutManagerDelegateImpl(
-          wm_root_window_controller_.get()));
-  workspace_layout_manager_ = new WorkspaceLayoutManager(
-      default_container, std::move(workspace_layout_manager_delegate));
+  workspace_layout_manager_ = new WorkspaceLayoutManager(default_container);
   default_container->SetLayoutManager(
       base::WrapUnique(workspace_layout_manager_));
 
   WmWindowMus* docked_container =
       GetWindowByShellWindowId(kShellWindowId_DockedContainer);
   docked_container->SetLayoutManager(
       base::WrapUnique(new DockedWindowLayoutManager(docked_container)));
 
   WmWindowMus* panel_container =
       GetWindowByShellWindowId(kShellWindowId_PanelContainer);
   panel_container->SetLayoutManager(
       base::WrapUnique(new PanelLayoutManager(panel_container)));
 }
 
 }  // namespace mus
 }  // namespace ash