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 "components/mus/view_tree_impl.h" | 5 #include "components/mus/vm/view_tree_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "components/mus/connection_manager.h" | 9 #include "components/mus/vm/connection_manager.h" |
10 #include "components/mus/default_access_policy.h" | 10 #include "components/mus/vm/default_access_policy.h" |
11 #include "components/mus/display_manager.h" | 11 #include "components/mus/vm/display_manager.h" |
12 #include "components/mus/server_view.h" | 12 #include "components/mus/vm/server_view.h" |
13 #include "components/mus/view_tree_host_impl.h" | 13 #include "components/mus/vm/view_tree_host_impl.h" |
14 #include "components/mus/window_manager_access_policy.h" | 14 #include "components/mus/vm/window_manager_access_policy.h" |
15 #include "mojo/converters/geometry/geometry_type_converters.h" | 15 #include "mojo/converters/geometry/geometry_type_converters.h" |
16 #include "mojo/converters/ime/ime_type_converters.h" | 16 #include "mojo/converters/ime/ime_type_converters.h" |
17 #include "mojo/converters/input_events/input_events_type_converters.h" | 17 #include "mojo/converters/input_events/input_events_type_converters.h" |
18 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 18 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
19 #include "ui/platform_window/text_input_state.h" | 19 #include "ui/platform_window/text_input_state.h" |
20 | 20 |
21 using mojo::Array; | 21 using mojo::Array; |
22 using mojo::Callback; | 22 using mojo::Callback; |
23 using mojo::InterfaceRequest; | 23 using mojo::InterfaceRequest; |
24 using mojo::OrderDirection; | 24 using mojo::OrderDirection; |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
673 ViewTreeImpl* connection = | 673 ViewTreeImpl* connection = |
674 connection_manager_->GetConnectionWithRoot(view->id()); | 674 connection_manager_->GetConnectionWithRoot(view->id()); |
675 return connection && connection != this; | 675 return connection && connection != this; |
676 } | 676 } |
677 | 677 |
678 bool ViewTreeImpl::IsDescendantOfEmbedRoot(const ServerView* view) { | 678 bool ViewTreeImpl::IsDescendantOfEmbedRoot(const ServerView* view) { |
679 return is_embed_root_ && root_ && GetView(*root_)->Contains(view); | 679 return is_embed_root_ && root_ && GetView(*root_)->Contains(view); |
680 } | 680 } |
681 | 681 |
682 } // namespace mus | 682 } // namespace mus |
OLD | NEW |