mash: Remove WorkspaceLayoutManagerDelegate.

ash/mus/workspace/workspace_layout_manager_unittest.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 <string>
 #include <utility>
 
+#include "ash/common/shell_observer.h"
 #include "ash/common/wm/fullscreen_window_finder.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_root_window_controller_observer.h"
+#include "ash/common/wm_shell.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/bridge/wm_window_mus_test_api.h"
 #include "ash/mus/test/wm_test_base.h"
 #include "base/run_loop.h"
 #include "services/ui/public/cpp/tests/test_window.h"
 #include "ui/display/display.h"
 
 namespace ash {
 namespace mus {
@@ skipping 16 matching lines @@
     return true;
   }
 
  private:
   const gfx::Rect initial_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(MaximizeDelegateView);
 };
 */
 
-class FullscreenObserver : public WmRootWindowControllerObserver {
+class FullscreenObserver : public ShellObserver {
  public:
-  explicit FullscreenObserver(WmRootWindowController* root_window_controller)
-      : root_window_controller_(root_window_controller),
-        call_count_(0),
-        is_fullscreen_(false) {
-    root_window_controller_->AddObserver(this);
+  FullscreenObserver() : call_count_(0), is_fullscreen_(false) {
+    WmShell::Get()->AddShellObserver(this);
   }
 
-  ~FullscreenObserver() override {
-    root_window_controller_->RemoveObserver(this);
-  }
+  ~FullscreenObserver() override { WmShell::Get()->RemoveShellObserver(this); }
 
-  void OnFullscreenStateChanged(bool is_fullscreen) override {
+  void OnFullscreenStateChanged(bool is_fullscreen,
+                                WmWindow* root_window) override {
     call_count_++;
     is_fullscreen_ = is_fullscreen;
   }
 
   int call_count() const { return call_count_; }
 
   bool is_fullscreen() const { return is_fullscreen_; }
 
  private:
-  WmRootWindowController* root_window_controller_;
   int call_count_;
   bool is_fullscreen_;
 
   DISALLOW_COPY_AND_ASSIGN(FullscreenObserver);
 };
 
 }  // namespace
 
 using WorkspaceLayoutManagerTest = WmTestBase;
 
@@ skipping 364 matching lines @@
             window->bounds().ToString());
 
   // Directly setting the bounds triggers a slightly different code path. Verify
   // that too.
   WmWindowMus::Get(window)->SetBounds(window_bounds);
   EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
             window->bounds().ToString());
 }
 
 TEST_F(WorkspaceLayoutManagerTest, NotifyFullscreenChanges) {
-  FullscreenObserver observer(
-      WmWindowMus::Get(GetPrimaryRootWindow())->GetRootWindowController());
+  FullscreenObserver observer;
   ui::Window* window1 = CreateTestWindow(gfx::Rect(1, 2, 30, 40));
   ui::Window* window2 = CreateTestWindow(gfx::Rect(1, 2, 30, 40));
   wm::WindowState* window_state1 = WmWindowMus::Get(window1)->GetWindowState();
   wm::WindowState* window_state2 = WmWindowMus::Get(window2)->GetWindowState();
   window_state2->Activate();
 
   const wm::WMEvent toggle_fullscreen_event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   window_state2->OnWMEvent(&toggle_fullscreen_event);
   EXPECT_EQ(1, observer.call_count());
   EXPECT_TRUE(observer.is_fullscreen());
@@ skipping 626 matching lines @@
                       occluded_window_bounds.width(),
                       occluded_window_bounds.height()).ToString(),
             window->bounds().ToString());
   HideKeyboard();
   EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString());
 }
 */
 
 }  // namespace mus
 }  // namespace ash