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

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

Issue 2552783002: In aura mus, WindowManagerClient::AddAccelerator() should take an array. (Closed)
Patch Set: Remove unused include. Created 4 years 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.h ('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 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 "ui/aura/mus/window_tree_client.h" 5 #include "ui/aura/mus/window_tree_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 std::move(values)); 1425 std::move(values));
1426 } 1426 }
1427 } 1427 }
1428 1428
1429 void WindowTreeClient::SetNonClientCursor(Window* window, 1429 void WindowTreeClient::SetNonClientCursor(Window* window,
1430 ui::mojom::Cursor cursor_id) { 1430 ui::mojom::Cursor cursor_id) {
1431 window_manager_internal_client_->WmSetNonClientCursor( 1431 window_manager_internal_client_->WmSetNonClientCursor(
1432 WindowMus::Get(window)->server_id(), cursor_id); 1432 WindowMus::Get(window)->server_id(), cursor_id);
1433 } 1433 }
1434 1434
1435 void WindowTreeClient::AddAccelerator( 1435 void WindowTreeClient::AddAccelerators(
1436 uint32_t id, 1436 std::vector<ui::mojom::AcceleratorPtr> accelerators,
1437 ui::mojom::EventMatcherPtr event_matcher,
1438 const base::Callback<void(bool)>& callback) { 1437 const base::Callback<void(bool)>& callback) {
1439 if (window_manager_internal_client_) { 1438 if (window_manager_internal_client_) {
1440 window_manager_internal_client_->AddAccelerators( 1439 window_manager_internal_client_->AddAccelerators(std::move(accelerators),
1441 ui::CreateAcceleratorVector(id, std::move(event_matcher)), callback); 1440 callback);
1442 } 1441 }
1443 } 1442 }
1444 1443
1445 void WindowTreeClient::RemoveAccelerator(uint32_t id) { 1444 void WindowTreeClient::RemoveAccelerator(uint32_t id) {
1446 if (window_manager_internal_client_) { 1445 if (window_manager_internal_client_) {
1447 window_manager_internal_client_->RemoveAccelerator(id); 1446 window_manager_internal_client_->RemoveAccelerator(id);
1448 } 1447 }
1449 } 1448 }
1450 1449
1451 void WindowTreeClient::AddActivationParent(Window* window) { 1450 void WindowTreeClient::AddActivationParent(Window* window) {
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1615 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1617 this, capture_synchronizer_.get(), window)); 1616 this, capture_synchronizer_.get(), window));
1618 } 1617 }
1619 1618
1620 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1619 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1621 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1620 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1622 this, focus_synchronizer_.get(), window)); 1621 this, focus_synchronizer_.get(), window));
1623 } 1622 }
1624 1623
1625 } // namespace aura 1624 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698