Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Side by Side Diff: ui/aura/mus/window_port_mus.cc

Issue 2667073002: mash: changes can_accept_events to an enum (Closed)
Patch Set: merge Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/aura/mus/window_port_mus.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 } 59 }
60 60
61 void WindowPortMus::SetPredefinedCursor(ui::mojom::Cursor cursor_id) { 61 void WindowPortMus::SetPredefinedCursor(ui::mojom::Cursor cursor_id) {
62 if (cursor_id == predefined_cursor_) 62 if (cursor_id == predefined_cursor_)
63 return; 63 return;
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::SetCanAcceptEvents(bool value) { 69 void WindowPortMus::SetEventTargetingPolicy(
70 window_tree_client_->SetCanAcceptEvents(this, value); 70 ui::mojom::EventTargetingPolicy policy) {
71 window_tree_client_->SetEventTargetingPolicy(this, policy);
71 } 72 }
72 73
73 void WindowPortMus::Embed( 74 void WindowPortMus::Embed(
74 ui::mojom::WindowTreeClientPtr client, 75 ui::mojom::WindowTreeClientPtr client,
75 uint32_t flags, 76 uint32_t flags,
76 const ui::mojom::WindowTree::EmbedCallback& callback) { 77 const ui::mojom::WindowTree::EmbedCallback& callback) {
77 window_tree_client_->Embed(window_, std::move(client), flags, callback); 78 window_tree_client_->Embed(window_, std::move(client), flags, callback);
78 } 79 }
79 80
80 std::unique_ptr<ui::WindowCompositorFrameSink> 81 std::unique_ptr<ui::WindowCompositorFrameSink>
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 change_data.property_name = 443 change_data.property_name =
443 GetPropertyConverter()->GetTransportNameForPropertyKey(key); 444 GetPropertyConverter()->GetTransportNameForPropertyKey(key);
444 // TODO(sky): investigate to see if we need to compare data. In particular do 445 // TODO(sky): investigate to see if we need to compare data. In particular do
445 // we ever have a case where changing a property cascades into changing the 446 // we ever have a case where changing a property cascades into changing the
446 // same property? 447 // same property?
447 if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data)) 448 if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data))
448 window_tree_client_->OnWindowMusPropertyChanged(this, key, std::move(data)); 449 window_tree_client_->OnWindowMusPropertyChanged(this, key, std::move(data));
449 } 450 }
450 451
451 } // namespace aura 452 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_port_mus.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698