WindowManagerClient::AddAccelerator() should take an array

services/ui/public/cpp/window_tree_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/public/cpp/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 1418 matching lines @@
         std::move(values));
   }
 }
 
 void WindowTreeClient::SetNonClientCursor(Window* window,
                                           ui::mojom::Cursor cursor_id) {
   window_manager_internal_client_->WmSetNonClientCursor(server_id(window),
                                                         cursor_id);
 }
 
 void WindowTreeClient::AddAccelerator(

[mfomitchev, 2016/11/22 22:44:16]

nit: AddAccelerators

[thanhph, 2016/11/24 16:10:13]

Done.

-    uint32_t id,
-    mojom::EventMatcherPtr event_matcher,
+    mojo::Array<mojom::AcceleratorEventPtr> multi_accelerators,

[mfomitchev, 2016/11/22 22:44:16]

Try to be consistent in naming: you are using accelerator_events elsewhere, so
use the same name here.

[thanhph, 2016/11/24 16:10:13]

Done, I use multi_accelerators as the main name.

     const base::Callback<void(bool)>& callback) {
   if (window_manager_internal_client_) {
     window_manager_internal_client_->AddAccelerator(
-        id, std::move(event_matcher), callback);
+        std::move(multi_accelerators), callback);
   }
 }
 
 void WindowTreeClient::RemoveAccelerator(uint32_t id) {
   if (window_manager_internal_client_) {
     window_manager_internal_client_->RemoveAccelerator(id);
   }
 }
 
 void WindowTreeClient::AddActivationParent(Window* window) {
@@ skipping 19 matching lines @@
     // TODO(riajiang): Figure out if |offset| needs to be converted.
     // (http://crbugs.com/646932)
     window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
         server_id(window), offset.x(), offset.y(),
         gfx::ConvertInsetsToDIP(ScaleFactorForDisplay(window->display_id()),
                                 hit_area));
   }
 }
 
 }  // namespace ui