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

Side by Side Diff: services/ui/public/cpp/window_tree_client.cc

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Use std::move instead of Clone() 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
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 "services/ui/public/cpp/window_tree_client.h" 5 #include "services/ui/public/cpp/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 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 std::move(values)); 1432 std::move(values));
1433 } 1433 }
1434 } 1434 }
1435 1435
1436 void WindowTreeClient::SetNonClientCursor(Window* window, 1436 void WindowTreeClient::SetNonClientCursor(Window* window,
1437 ui::mojom::Cursor cursor_id) { 1437 ui::mojom::Cursor cursor_id) {
1438 window_manager_internal_client_->WmSetNonClientCursor(server_id(window), 1438 window_manager_internal_client_->WmSetNonClientCursor(server_id(window),
1439 cursor_id); 1439 cursor_id);
1440 } 1440 }
1441 1441
1442 void WindowTreeClient::AddAccelerator( 1442 void WindowTreeClient::AddAccelerators(
1443 uint32_t id, 1443 std::vector<mojom::AcceleratorPtr> accelerators,
1444 mojom::EventMatcherPtr event_matcher,
1445 const base::Callback<void(bool)>& callback) { 1444 const base::Callback<void(bool)>& callback) {
1446 if (window_manager_internal_client_) { 1445 if (window_manager_internal_client_) {
1447 window_manager_internal_client_->AddAccelerator( 1446 window_manager_internal_client_->AddAccelerators(std::move(accelerators),
1448 id, std::move(event_matcher), callback); 1447 callback);
1449 } 1448 }
1450 } 1449 }
1451 1450
1452 void WindowTreeClient::RemoveAccelerator(uint32_t id) { 1451 void WindowTreeClient::RemoveAccelerator(uint32_t id) {
1453 if (window_manager_internal_client_) { 1452 if (window_manager_internal_client_) {
1454 window_manager_internal_client_->RemoveAccelerator(id); 1453 window_manager_internal_client_->RemoveAccelerator(id);
1455 } 1454 }
1456 } 1455 }
1457 1456
1458 void WindowTreeClient::AddActivationParent(Window* window) { 1457 void WindowTreeClient::AddActivationParent(Window* window) {
(...skipping 19 matching lines...) Expand all
1478 // TODO(riajiang): Figure out if |offset| needs to be converted. 1477 // TODO(riajiang): Figure out if |offset| needs to be converted.
1479 // (http://crbugs.com/646932) 1478 // (http://crbugs.com/646932)
1480 window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea( 1479 window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
1481 server_id(window), offset.x(), offset.y(), 1480 server_id(window), offset.x(), offset.y(),
1482 gfx::ConvertInsetsToDIP(ScaleFactorForDisplay(window->display_id()), 1481 gfx::ConvertInsetsToDIP(ScaleFactorForDisplay(window->display_id()),
1483 hit_area)); 1482 hit_area));
1484 } 1483 }
1485 } 1484 }
1486 1485
1487 } // namespace ui 1486 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/public/cpp/window_tree_client.h ('k') | services/ui/public/interfaces/window_manager.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698