WorkspaceLayoutManagerDelegate -> WorkspaceLayoutManagerBackdropDelegate

ash/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/wm/workspace/workspace_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/session/session_state_delegate.h"
-#include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/always_on_top_controller.h"
+#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
-#include "ash/wm/workspace/workspace_layout_manager_delegate.h"
+#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/gfx/screen.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 using aura::Window;
 
 namespace ash {
 
-WorkspaceLayoutManager::WorkspaceLayoutManager(aura::Window* window)
-    : shelf_(NULL),
-      window_(window),
+WorkspaceLayoutManager::WorkspaceLayoutManager(
+    aura::Window* window,
+    std::unique_ptr<wm::WorkspaceLayoutManagerDelegate> delegate)
+    : window_(window),
       root_window_(window->GetRootWindow()),
+      delegate_(std::move(delegate)),
       work_area_in_parent_(ScreenUtil::ConvertRectFromScreen(
           window_,
           gfx::Screen::GetScreen()
               ->GetDisplayNearestWindow(window_)
               .work_area())),
       is_fullscreen_(GetRootWindowController(window->GetRootWindow())
                          ->GetWindowForFullscreenMode() != NULL) {
   Shell::GetInstance()->activation_client()->AddObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
   root_window_->AddObserver(this);
   DCHECK(window->GetProperty(kSnapChildrenToPixelBoundary));
 }
 
 WorkspaceLayoutManager::~WorkspaceLayoutManager() {
   if (root_window_)
     root_window_->RemoveObserver(this);
   for (WindowSet::const_iterator i = windows_.begin(); i != windows_.end(); ++i)
     (*i)->RemoveObserver(this);
   Shell::GetInstance()->RemoveShellObserver(this);
   Shell::GetInstance()->activation_client()->RemoveObserver(this);
 }
 
-void WorkspaceLayoutManager::SetShelf(ShelfLayoutManager* shelf) {
-  shelf_ = shelf;
+void WorkspaceLayoutManager::DeleteDelegate() {
+  delegate_.reset();
 }
 
 void WorkspaceLayoutManager::SetMaximizeBackdropDelegate(
-    std::unique_ptr<WorkspaceLayoutManagerDelegate> delegate) {
+    std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
   backdrop_delegate_.reset(delegate.release());
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, aura::LayoutManager implementation:
 
 void WorkspaceLayoutManager::OnWindowAddedToLayout(Window* child) {
   wm::WindowState* window_state = wm::GetWindowState(child);
   wm::WMEvent event(wm::WM_EVENT_ADDED_TO_WORKSPACE);
   window_state->OnWMEvent(&event);
@@ skipping 243 matching lines @@
   // the host window.
   // We also need to do this when the work area insets changes.
   for (WindowSet::const_iterator it = windows_.begin();
        it != windows_.end();
        ++it) {
     wm::GetWindowState(*it)->OnWMEvent(event);
   }
 }
 
 void WorkspaceLayoutManager::UpdateShelfVisibility() {
-  if (shelf_)
-    shelf_->UpdateVisibilityState();
+  if (delegate_)
+    delegate_->UpdateShelfVisibility();
 }
 
 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 (!shelf_)
+  if (!delegate_)
     return;
   bool is_fullscreen = GetRootWindowController(
       window_->GetRootWindow())->GetWindowForFullscreenMode() != NULL;
   if (is_fullscreen != is_fullscreen_) {
-    ash::Shell::GetInstance()->NotifyFullscreenStateChange(
-        is_fullscreen, window_->GetRootWindow());
+    delegate_->OnFullscreenStateChanged(is_fullscreen);
     is_fullscreen_ = is_fullscreen;
   }
 }
 
 }  // namespace ash