mash/wm: Fix detecting container windows.

mash/wm/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 "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/util.h"
@@ skipping 55 matching lines @@
 shell::Connector* RootWindowController::GetConnector() {
   return app_->connector();
 }
 
 mus::Window* RootWindowController::GetWindowForContainer(
     mojom::Container container) {
   return root_->GetChildByLocalId(ContainerToLocalId(container));
 }
 
 bool RootWindowController::WindowIsContainer(const mus::Window* window) const {
-  return window && window->parent() == root_;
+  return window && window != root_ &&
+         window->local_id() < ContainerToLocalId(mojom::Container::COUNT);

[sky, 2016/04/22 15:23:41]

The default local_id is -1, should you check for local_id >= 0?

[sadrul, 2016/04/22 16:06:05]

Changed to > 0 (to exclude root)

 }
 
 mus::WindowManagerClient* RootWindowController::window_manager_client() {
   return window_manager_->window_manager_client();
 }
 
 void RootWindowController::OnAccelerator(uint32_t id, const ui::Event& event) {
   switch (id) {
     case kWindowSwitchAccelerator:
       window_manager_client()->ActivateNextWindow();
@@ skipping 114 matching lines @@
   CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT);
   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT);
 }
 
 }  // namespace wm
 }  // namespace mash