WIP: Propagate SurfaceID up window tree hierarchy

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 43 matching lines @@
       root_(root),
       window_count_(0),
       display_(display),
       wm_root_window_controller_(
           base::MakeUnique<WmRootWindowControllerMus>(window_manager_->shell(),
                                                       this)) {
   wm_root_window_controller_->CreateContainers();
   wm_root_window_controller_->CreateLayoutManagers();
   CreateLayoutManagers();
 
+  root_->SetIsContainer();
   disconnected_app_handler_.reset(new DisconnectedAppHandler(root));
 
   // Force a layout of the root, and its children, RootWindowLayout handles
   // both.
   wm_root_window_controller_->root_window_layout_manager()->OnWindowResized();
 
   for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
     window_manager_->window_manager_client()->AddActivationParent(
         GetWindowByShellWindowId(kActivatableShellWindowIds[i])->mus_window());
   }
@@ skipping 19 matching lines @@
   // TODO(sky): panels need a different frame, http:://crbug.com/614362.
   const bool provide_non_client_frame =
       GetWindowType(*properties) == ui::mojom::WindowType::WINDOW ||
       GetWindowType(*properties) == ui::mojom::WindowType::PANEL;
   if (provide_non_client_frame)
     (*properties)[ui::mojom::kWaitForUnderlay_Property].clear();
 
   // TODO(sky): constrain and validate properties before passing to server.
   ui::Window* window = root_->window_tree()->NewWindow(properties);
   window->SetBounds(CalculateDefaultBounds(window));
+  // window->SetIsContainer();
 
   ui::Window* container_window = nullptr;
   mojom::Container container;
   if (GetRequestedContainer(window, &container)) {
     container_window = GetWindowForContainer(container);
   } else {
     // TODO(sky): window->bounds() isn't quite right.
     container_window = WmWindowMus::GetMusWindow(wm::GetDefaultParent(
         WmWindowMus::Get(root_), WmWindowMus::Get(window), window->bounds()));
   }
+  container_window->SetIsContainer();
   DCHECK(WmWindowMus::Get(container_window)->IsContainer());
 
   if (provide_non_client_frame) {
     NonClientFrameController::Create(container_window, window,
                                      window_manager_->window_manager_client());
   } else {
     container_window->AddChild(window);
   }
 
   window_count_++;
@@ skipping 54 matching lines @@
       GetWindowByShellWindowId(kShellWindowId_DefaultContainer);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a
   // wm::LayoutManager), so it can't be in |layout_managers_|.
   workspace_layout_manager_ = new WorkspaceLayoutManager(default_container);
   default_container->SetLayoutManager(
       base::WrapUnique(workspace_layout_manager_));
 }
 
 }  // namespace mus
 }  // namespace ash