mash: Disable ash_sysui; begin removal.

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>
@@ skipping 146 matching lines @@
       GetWindowByShellWindowId(MashContainerToAshShellWindowId(container));
   DCHECK(wm_window);
   return wm_window->mus_window();
 }
 
 WmWindowMus* RootWindowController::GetWindowByShellWindowId(int id) {
   return WmWindowMus::AsWmWindowMus(
       WmWindowMus::Get(root_)->GetChildByShellWindowId(id));
 }
 
-ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
-  return static_cast<ShelfLayoutManager*>(
-      layout_managers_[GetWindowForContainer(Container::USER_PRIVATE_SHELF)]
-          .get());
-}
-
-StatusLayoutManager* RootWindowController::GetStatusLayoutManager() {
-  return static_cast<StatusLayoutManager*>(
-      layout_managers_[GetWindowForContainer(Container::STATUS)].get());
-}
-
 gfx::Rect RootWindowController::CalculateDefaultBounds(
     ui::Window* window) const {
   if (window->HasSharedProperty(
           ui::mojom::WindowManager::kInitialBounds_Property)) {
     return window->GetSharedProperty<gfx::Rect>(
         ui::mojom::WindowManager::kInitialBounds_Property);
   }
 
   if (GetWindowShowState(window) == ui::mojom::ShowState::FULLSCREEN) {
     return gfx::Rect(0, 0, root_->bounds().width(), root_->bounds().height());
@@ skipping 11 matching lines @@
     height = std::max(0, std::min(max_size.height(), pref.height()));
   }
   return gfx::Rect(40 + (window_count_ % 4) * 40, 40 + (window_count_ % 4) * 40,
                    width, height);
 }
 
 void RootWindowController::OnShelfWindowAvailable() {
   DockedWindowLayoutManager* docked_window_layout_manager =
       DockedWindowLayoutManager::Get(WmWindowMus::Get(root_));
 
-  // Following code expects the shelf to be called only once.
-  // TODO(sky): this check is only necessary while we have shelf hosted in
-  // sysui (as sysui can restart). Once that is fixed there should be a DCHECK
-  // that the shelf hasn't been set.
-  if (docked_window_layout_manager->shelf())
-    return;
-
+  DCHECK(!docked_window_layout_manager->shelf());
   docked_window_layout_manager->SetShelf(wm_shelf_.get());
 
   PanelLayoutManager::Get(WmWindowMus::Get(root_))->SetShelf(wm_shelf_.get());
 
   // TODO: http://crbug.com/614182 Ash's ShelfLayoutManager implements
   // DockedWindowLayoutManagerObserver so that it can inset by the docked
   // windows.
   // docked_layout_manager_->AddObserver(shelf_->shelf_layout_manager());
 }
 
@@ skipping 35 matching lines @@
       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