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

Side by Side Diff: ui/aura/test/mus/window_tree_client_private.cc

Issue 2685883003: chromeos: converts observed pointer events to DIPs (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_tree_client_unittest.cc ('k') | no next file » | 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/test/mus/window_tree_client_private.h" 5 #include "ui/aura/test/mus/window_tree_client_private.h"
6 6
7 #include "ui/aura/mus/window_port_mus.h" 7 #include "ui/aura/mus/window_port_mus.h"
8 #include "ui/aura/mus/window_tree_client.h" 8 #include "ui/aura/mus/window_tree_client.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/display/display.h" 10 #include "ui/display/display.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 bool parent_drawn) { 49 bool parent_drawn) {
50 return tree_client_impl_->WmNewDisplayAddedImpl(display, std::move(root_data), 50 return tree_client_impl_->WmNewDisplayAddedImpl(display, std::move(root_data),
51 parent_drawn); 51 parent_drawn);
52 } 52 }
53 53
54 void WindowTreeClientPrivate::CallOnWindowInputEvent( 54 void WindowTreeClientPrivate::CallOnWindowInputEvent(
55 Window* window, 55 Window* window,
56 std::unique_ptr<ui::Event> event) { 56 std::unique_ptr<ui::Event> event) {
57 const uint32_t event_id = 0u; 57 const uint32_t event_id = 0u;
58 const uint32_t observer_id = 0u; 58 const uint32_t observer_id = 0u;
59 tree_client_impl_->OnWindowInputEvent(event_id, 59 const int64_t display_id = 0;
60 WindowPortMus::Get(window)->server_id(), 60 tree_client_impl_->OnWindowInputEvent(
61 std::move(event), observer_id); 61 event_id, WindowPortMus::Get(window)->server_id(), display_id,
62 std::move(event), observer_id);
62 } 63 }
63 64
64 void WindowTreeClientPrivate::CallOnCaptureChanged(Window* new_capture, 65 void WindowTreeClientPrivate::CallOnCaptureChanged(Window* new_capture,
65 Window* old_capture) { 66 Window* old_capture) {
66 tree_client_impl_->OnCaptureChanged( 67 tree_client_impl_->OnCaptureChanged(
67 new_capture ? WindowPortMus::Get(new_capture)->server_id() : 0, 68 new_capture ? WindowPortMus::Get(new_capture)->server_id() : 0,
68 old_capture ? WindowPortMus::Get(old_capture)->server_id() : 0); 69 old_capture ? WindowPortMus::Get(old_capture)->server_id() : 0);
69 } 70 }
70 71
71 void WindowTreeClientPrivate::SetTreeAndClientId( 72 void WindowTreeClientPrivate::SetTreeAndClientId(
72 ui::mojom::WindowTree* window_tree, 73 ui::mojom::WindowTree* window_tree,
73 ClientSpecificId client_id) { 74 ClientSpecificId client_id) {
74 tree_client_impl_->WindowTreeConnectionEstablished(window_tree); 75 tree_client_impl_->WindowTreeConnectionEstablished(window_tree);
75 tree_client_impl_->client_id_ = client_id; 76 tree_client_impl_->client_id_ = client_id;
76 } 77 }
77 78
78 bool WindowTreeClientPrivate::HasPointerWatcher() { 79 bool WindowTreeClientPrivate::HasPointerWatcher() {
79 return tree_client_impl_->has_pointer_watcher_; 80 return tree_client_impl_->has_pointer_watcher_;
80 } 81 }
81 82
82 Window* WindowTreeClientPrivate::GetWindowByServerId(Id id) { 83 Window* WindowTreeClientPrivate::GetWindowByServerId(Id id) {
83 WindowMus* window = tree_client_impl_->GetWindowByServerId(id); 84 WindowMus* window = tree_client_impl_->GetWindowByServerId(id);
84 return window ? window->GetWindow() : nullptr; 85 return window ? window->GetWindow() : nullptr;
85 } 86 }
86 87
87 } // namespace aura 88 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698