exo: Improved implementation of child surfaces and popups.

components/exo/shell_surface_unittest.cc

 // Copyright 2015 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 "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/exo/buffer.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/surface.h"
 #include "components/exo/test/exo_test_base.h"
 #include "components/exo/test/exo_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/window_util.h"
 
 namespace exo {
 namespace {
 
 using ShellSurfaceTest = test::ExoTestBase;
 
 TEST_F(ShellSurfaceTest, SetParent) {
   gfx::Size buffer_size(256, 256);
   scoped_ptr<Buffer> parent_buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   scoped_ptr<Surface> parent_surface(new Surface);
   scoped_ptr<ShellSurface> parent_shell_surface(
       new ShellSurface(parent_surface.get()));
 
   parent_surface->Attach(parent_buffer.get());
   parent_surface->Commit();
 
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   shell_surface->SetParent(parent_shell_surface.get());
 
   surface->Attach(buffer.get());
   surface->Commit();
-  EXPECT_EQ(shell_surface->GetWidget()->GetNativeWindow()->parent(),
-            parent_shell_surface->GetWidget()->GetNativeWindow());
+  EXPECT_EQ(
+      parent_shell_surface->GetWidget()->GetNativeWindow(),
+      wm::GetTransientParent(shell_surface->GetWidget()->GetNativeWindow()));
 }
 
 TEST_F(ShellSurfaceTest, Maximize) {
   gfx::Size buffer_size(256, 256);
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
 
   surface->Attach(buffer.get());
@@ skipping 164 matching lines @@
   surface->Attach(buffer.get());
   surface->Commit();
   shell_surface->GetWidget()->Activate();
   EXPECT_TRUE(is_active);
   shell_surface->GetWidget()->Deactivate();
   EXPECT_FALSE(is_active);
 }
 
 }  // namespace
 }  // namespace exo