| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 | 5 | 
| 6 #include "base/callback.h" | 6 #include "base/callback.h" | 
| 7 #include "base/macros.h" | 7 #include "base/macros.h" | 
|  | 8 #include "base/memory/ptr_util.h" | 
| 8 #include "services/ui/public/cpp/property_type_converters.h" | 9 #include "services/ui/public/cpp/property_type_converters.h" | 
| 9 #include "services/ui/public/cpp/tests/window_tree_client_private.h" | 10 #include "services/ui/public/cpp/tests/window_tree_client_private.h" | 
| 10 #include "services/ui/public/cpp/window.h" | 11 #include "services/ui/public/cpp/window.h" | 
| 11 #include "services/ui/public/cpp/window_observer.h" | 12 #include "services/ui/public/cpp/window_observer.h" | 
| 12 #include "services/ui/public/cpp/window_property.h" | 13 #include "services/ui/public/cpp/window_property.h" | 
| 13 #include "services/ui/public/cpp/window_tree_client.h" | 14 #include "services/ui/public/cpp/window_tree_client.h" | 
| 14 #include "services/ui/public/interfaces/window_manager.mojom.h" | 15 #include "services/ui/public/interfaces/window_manager.mojom.h" | 
| 15 #include "services/ui/public/interfaces/window_tree.mojom.h" | 16 #include "services/ui/public/interfaces/window_tree.mojom.h" | 
| 16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" | 
| 17 #include "third_party/skia/include/core/SkBitmap.h" | 18 #include "third_party/skia/include/core/SkBitmap.h" | 
| (...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 674   not_child_params.name = "Not Child Widget"; | 675   not_child_params.name = "Not Child Widget"; | 
| 675   not_child_params.native_widget = | 676   not_child_params.native_widget = | 
| 676       new NativeWidgetMus(not_child_widget.get(), not_child_window, | 677       new NativeWidgetMus(not_child_widget.get(), not_child_window, | 
| 677                           ui::mojom::CompositorFrameSinkType::DEFAULT); | 678                           ui::mojom::CompositorFrameSinkType::DEFAULT); | 
| 678   not_child_widget->Init(not_child_params); | 679   not_child_widget->Init(not_child_params); | 
| 679 | 680 | 
| 680   EXPECT_NE(not_child_window->parent(), parent_window); | 681   EXPECT_NE(not_child_window->parent(), parent_window); | 
| 681 } | 682 } | 
| 682 | 683 | 
| 683 }  // namespace views | 684 }  // namespace views | 
| OLD | NEW | 
|---|