Merges RootWindowControllerCommon into WmRootWindowController

ash/common/wm/workspace_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/common/wm/workspace_controller.h"
 
 #include <utility>
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
@@ skipping 34 matching lines @@
 
 WorkspaceController::~WorkspaceController() {
   if (!viewport_)
     return;
 
   viewport_->RemoveObserver(this);
   viewport_->SetLayoutManager(nullptr);
 }
 
 wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
-  if (!viewport_->GetRootWindowController()->HasShelf())
+  if (!viewport_ || !viewport_->GetRootWindowController()->HasShelf())
     return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 
   const WmWindow* fullscreen = wm::GetWindowForFullscreenMode(viewport_);
   if (fullscreen && !fullscreen->GetWindowState()->ignored_by_shelf())
     return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;
 
   // These are the container ids of containers which may contain windows that
   // may overlap the launcher shelf and affect its transparency.
   const int kWindowContainerIds[] = {
       kShellWindowId_DefaultContainer, kShellWindowId_DockedContainer,
   };
   const gfx::Rect shelf_bounds(
       viewport_->GetRootWindowController()->GetShelf()->GetIdealBounds());
   bool window_overlaps_launcher = false;
   for (size_t i = 0; i < arraysize(kWindowContainerIds); i++) {
     WmWindow* container = viewport_->GetRootWindow()->GetChildByShellWindowId(
         kWindowContainerIds[i]);
     for (WmWindow* window : container->GetChildren()) {
       wm::WindowState* window_state = window->GetWindowState();
       if (window_state->ignored_by_shelf() ||
-          !window->GetLayer()->GetTargetVisibility()) {
+          (window->GetLayer() && !window->GetLayer()->GetTargetVisibility())) {
         continue;
       }
       if (window_state->IsMaximized())
         return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
       window_overlaps_launcher |= window->GetBounds().Intersects(shelf_bounds);
     }
   }
 
   // Check if there are visible docked windows in the same display.
   DockedWindowLayoutManager* dock = DockedWindowLayoutManager::Get(viewport_);
@@ skipping 38 matching lines @@
 
 void WorkspaceController::OnWindowDestroying(WmWindow* window) {
   DCHECK_EQ(window, viewport_);
   viewport_->RemoveObserver(this);
   viewport_ = nullptr;
   // Destroy |event_handler_| too as it depends upon |window|.
   event_handler_.reset();
 }
 
 }  // namespace ash