| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 using mojo::String; | 27 using mojo::String; |
| 28 using mus::mojom::ErrorCode; | 28 using mus::mojom::ErrorCode; |
| 29 using mus::mojom::EventPtr; | 29 using mus::mojom::EventPtr; |
| 30 using mus::mojom::ViewportMetricsPtr; | 30 using mus::mojom::ViewportMetricsPtr; |
| 31 using mus::mojom::WindowDataPtr; | 31 using mus::mojom::WindowDataPtr; |
| 32 using mus::mojom::WindowTree; | 32 using mus::mojom::WindowTree; |
| 33 using mus::mojom::WindowTreeClient; | 33 using mus::mojom::WindowTreeClient; |
| 34 | 34 |
| 35 namespace mus { | 35 namespace mus { |
| 36 namespace ws { | 36 namespace ws { |
| 37 namespace test { |
| 37 | 38 |
| 38 namespace { | 39 namespace { |
| 39 | 40 |
| 40 // Creates an id used for transport from the specified parameters. | 41 // Creates an id used for transport from the specified parameters. |
| 41 Id BuildWindowId(ConnectionSpecificId connection_id, | 42 Id BuildWindowId(ConnectionSpecificId connection_id, |
| 42 ConnectionSpecificId window_id) { | 43 ConnectionSpecificId window_id) { |
| 43 return (connection_id << 16) | window_id; | 44 return (connection_id << 16) | window_id; |
| 44 } | 45 } |
| 45 | 46 |
| 46 // Callback function from WindowTree functions. | 47 // Callback function from WindowTree functions. |
| (...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1920 // TODO(sky): need to better track changes to initial connection. For example, | 1921 // TODO(sky): need to better track changes to initial connection. For example, |
| 1921 // that SetBounsdWindows/AddWindow and the like don't result in messages to the | 1922 // that SetBounsdWindows/AddWindow and the like don't result in messages to the |
| 1922 // originating connection. | 1923 // originating connection. |
| 1923 | 1924 |
| 1924 // TODO(sky): make sure coverage of what was | 1925 // TODO(sky): make sure coverage of what was |
| 1925 // WindowManagerTest.SecondEmbedRoot_InitService and | 1926 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 1926 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 1927 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 1927 // manager | 1928 // manager |
| 1928 // tests. | 1929 // tests. |
| 1929 | 1930 |
| 1931 } // namespace test |
| 1930 } // namespace ws | 1932 } // namespace ws |
| 1931 } // namespace mus | 1933 } // namespace mus |
| OLD | NEW |