services/ui/public/cpp/tests/window_server_test_base.cc - Issue 2125883003: Adds ability for pre-target accelerators to not consume events

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: services/ui/public/cpp/tests/window_server_test_base.cc

Issue 2125883003: Adds ability for pre-target accelerators to not consume events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « services/ui/public/cpp/tests/window_server_test_base.h ('k') | services/ui/public/cpp/window_manager_delegate.h » ('j') | services/ui/ws/window_tree.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: services/ui/public/cpp/tests/window_server_test_base.cc

diff --git a/services/ui/public/cpp/tests/window_server_test_base.cc b/services/ui/public/cpp/tests/window_server_test_base.cc

index bdb64dd46a44356f87bf390395670552adeb05c2..3168f0155d7b156ca2c80695151bcefe630484ae 100644

--- a/services/ui/public/cpp/tests/window_server_test_base.cc

+++ b/services/ui/public/cpp/tests/window_server_test_base.cc

@@ -131,9 +131,11 @@ void WindowServerTestBase::OnWmNewDisplay(Window* window,

window_manager_delegate_->OnWmNewDisplay(window, display);

}

-void WindowServerTestBase::OnAccelerator(uint32_t id, const ui::Event& event) {

- if (window_manager_delegate_)

- window_manager_delegate_->OnAccelerator(id, event);

+mojom::EventResult WindowServerTestBase::OnAccelerator(uint32_t accelerator_id,

+ const ui::Event& event) {

+ return window_manager_delegate_

+ ? window_manager_delegate_->OnAccelerator(accelerator_id, event)

+ : mojom::EventResult::UNHANDLED;

}

void WindowServerTestBase::Create(shell::Connection* connection,