| 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 #include "ui/aura/mus/window_port_mus.h" | 5 #include "ui/aura/mus/window_port_mus.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "ui/aura/client/aura_constants.h" | 8 #include "ui/aura/client/aura_constants.h" |
| 9 #include "ui/aura/client/transient_window_client.h" | 9 #include "ui/aura/client/transient_window_client.h" |
| 10 #include "ui/aura/mus/client_surface_embedder.h" | 10 #include "ui/aura/mus/client_surface_embedder.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 | 64 |
| 65 window_tree_client_->SetPredefinedCursor(this, predefined_cursor_, cursor_id); | 65 window_tree_client_->SetPredefinedCursor(this, predefined_cursor_, cursor_id); |
| 66 predefined_cursor_ = cursor_id; | 66 predefined_cursor_ = cursor_id; |
| 67 } | 67 } |
| 68 | 68 |
| 69 void WindowPortMus::SetEventTargetingPolicy( | 69 void WindowPortMus::SetEventTargetingPolicy( |
| 70 ui::mojom::EventTargetingPolicy policy) { | 70 ui::mojom::EventTargetingPolicy policy) { |
| 71 window_tree_client_->SetEventTargetingPolicy(this, policy); | 71 window_tree_client_->SetEventTargetingPolicy(this, policy); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void WindowPortMus::SetCanAcceptDrops(bool can_accept_drops) { |
| 75 window_tree_client_->SetCanAcceptDrops(this, can_accept_drops); |
| 76 } |
| 77 |
| 74 void WindowPortMus::Embed( | 78 void WindowPortMus::Embed( |
| 75 ui::mojom::WindowTreeClientPtr client, | 79 ui::mojom::WindowTreeClientPtr client, |
| 76 uint32_t flags, | 80 uint32_t flags, |
| 77 const ui::mojom::WindowTree::EmbedCallback& callback) { | 81 const ui::mojom::WindowTree::EmbedCallback& callback) { |
| 78 window_tree_client_->Embed(window_, std::move(client), flags, callback); | 82 window_tree_client_->Embed(window_, std::move(client), flags, callback); |
| 79 } | 83 } |
| 80 | 84 |
| 81 std::unique_ptr<ui::WindowCompositorFrameSink> | 85 std::unique_ptr<ui::WindowCompositorFrameSink> |
| 82 WindowPortMus::RequestCompositorFrameSink( | 86 WindowPortMus::RequestCompositorFrameSink( |
| 83 scoped_refptr<cc::ContextProvider> context_provider, | 87 scoped_refptr<cc::ContextProvider> context_provider, |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 442 GetPropertyConverter()->GetTransportNameForPropertyKey(key); | 446 GetPropertyConverter()->GetTransportNameForPropertyKey(key); |
| 443 // TODO(sky): investigate to see if we need to compare data. In particular do | 447 // TODO(sky): investigate to see if we need to compare data. In particular do |
| 444 // we ever have a case where changing a property cascades into changing the | 448 // we ever have a case where changing a property cascades into changing the |
| 445 // same property? | 449 // same property? |
| 446 if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data)) | 450 if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data)) |
| 447 window_tree_client_->OnWindowMusPropertyChanged(this, key, old_value, | 451 window_tree_client_->OnWindowMusPropertyChanged(this, key, old_value, |
| 448 std::move(data)); | 452 std::move(data)); |
| 449 } | 453 } |
| 450 | 454 |
| 451 } // namespace aura | 455 } // namespace aura |
| OLD | NEW |