WorkspaceLayoutManagerDelegate -> WorkspaceLayoutManagerBackdropDelegate

ash/root_window_controller.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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 15 matching lines @@
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/switchable_windows.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/touch/touch_hud_projection.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/always_on_top_controller.h"
+#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
 #include "ash/wm/dock/docked_window_layout_manager.h"
 #include "ash/wm/lock_layout_manager.h"
 #include "ash/wm/panels/attached_panel_window_targeter.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/panels/panel_window_event_handler.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/system_background_controller.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/models/menu_model.h"
@@ skipping 191 matching lines @@
   void OnWindowDestroying(aura::Window* window) override {}
   void OnWindowDestroyed(aura::Window* window) override { delete this; }
   void OnWindowTargetVisibilityChanged(bool visible) override {}
   bool HasHitTestMask() const override { return false; }
   void GetHitTestMask(gfx::Path* mask) const override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyWindowDelegate);
 };
 
+class WorkspaceLayoutManagerDelegateImpl
+    : public wm::WorkspaceLayoutManagerDelegate {
+ public:
+  explicit WorkspaceLayoutManagerDelegateImpl(aura::Window* root_window)
+      : root_window_(root_window) {}
+  ~WorkspaceLayoutManagerDelegateImpl() override {}

[oshima, 2016/04/14 19:12:55]

nit: = defualt;

+
+  void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; }
+
+  // WorkspaceLayoutManagerDelegate:
+  void UpdateShelfVisibility() override {
+    if (shelf_)
+      shelf_->UpdateVisibilityState();
+  }
+  void OnFullscreenStateChanged(bool is_fullscreen) override {
+    if (shelf_) {
+      ash::Shell::GetInstance()->NotifyFullscreenStateChange(is_fullscreen,
+                                                             root_window_);
+    }
+  }
+
+ private:
+  aura::Window* root_window_;
+  ShelfLayoutManager* shelf_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerDelegateImpl);
+};
+
 }  // namespace
 
 void RootWindowController::CreateForPrimaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host);
   controller->Init(RootWindowController::PRIMARY,
                    Shell::GetInstance()->delegate()->IsFirstRunAfterBoot());
 }
 
 void RootWindowController::CreateForSecondaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host);
@@ skipping 261 matching lines @@
       root_window->RemoveChild(window);
     }
   }
 
   shelf_.reset();
 }
 
 void RootWindowController::MoveWindowsTo(aura::Window* dst) {
   // Forget the shelf early so that shelf don't update itself using wrong
   // display info.
-  workspace_controller_->SetShelf(NULL);
+  workspace_controller_->SetShelf(nullptr);
+  workspace_controller_->layout_manager()->DeleteDelegate();
   ReparentAllWindows(GetRootWindow(), dst);
 }
 
 ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
   return shelf_->shelf_layout_manager();
 }
 
 SystemTray* RootWindowController::GetSystemTray() {
   // We assume in throughout the code that this will not return NULL. If code
   // triggers this for valid reasons, it should test status_area_widget first.
@@ skipping 181 matching lines @@
 }
 
 void RootWindowController::InitLayoutManagers() {
   aura::Window* root_window = GetRootWindow();
   root_window_layout_ = new RootWindowLayoutManager(root_window);
   root_window->SetLayoutManager(root_window_layout_);
 
   aura::Window* default_container =
       GetContainer(kShellWindowId_DefaultContainer);
   // Workspace manager has its own layout managers.
-  workspace_controller_.reset(
-      new WorkspaceController(default_container));
+
+  WorkspaceLayoutManagerDelegateImpl* workspace_layout_manager_delegate =
+      new WorkspaceLayoutManagerDelegateImpl(root_window);
+  workspace_controller_.reset(new WorkspaceController(
+      default_container, base::WrapUnique(workspace_layout_manager_delegate)));
 
   aura::Window* always_on_top_container =
       GetContainer(kShellWindowId_AlwaysOnTopContainer);
   always_on_top_controller_.reset(
       new AlwaysOnTopController(always_on_top_container));
 
   DCHECK(!shelf_.get());
   aura::Window* shelf_container = GetContainer(kShellWindowId_ShelfContainer);
   // TODO(harrym): Remove when status area is view.
   aura::Window* status_container = GetContainer(kShellWindowId_StatusContainer);
   shelf_.reset(new ShelfWidget(
       shelf_container, status_container, workspace_controller()));
+  workspace_layout_manager_delegate->set_shelf(shelf_->shelf_layout_manager());
 
   if (!Shell::GetInstance()->session_state_delegate()->
       IsActiveUserSessionStarted()) {
     // This window exists only to be a event target on login screen.
     // It does not have to handle events, nor be visible.
     mouse_event_target_.reset(new aura::Window(new EmptyWindowDelegate));
     mouse_event_target_->Init(ui::LAYER_NOT_DRAWN);
 
     aura::Window* lock_background_container =
         GetContainer(kShellWindowId_LockScreenBackgroundContainer);
@@ skipping 277 matching lines @@
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace ash