Renames ui::mojom::Accelerator to ui::mojom::WmAccelerator

ash/mus/accelerators/accelerator_controller_registrar.cc

 // Copyright 2016 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 "ash/mus/accelerators/accelerator_controller_registrar.h"
 
 #include <limits>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_router.h"
@@ skipping 82 matching lines @@
   }
   DCHECK_EQ(GetAcceleratorLocalId(id), ids.post_id);
   // NOTE: for post return value doesn't really matter.
   return WmShell::Get()->accelerator_controller()->Process(accelerator)
              ? ui::mojom::EventResult::HANDLED
              : ui::mojom::EventResult::UNHANDLED;
 }
 
 void AcceleratorControllerRegistrar::OnAcceleratorsRegistered(
     const std::vector<ui::Accelerator>& accelerators) {
-  std::vector<ui::mojom::AcceleratorPtr> accelerator_vector;
+  std::vector<ui::mojom::WmAcceleratorPtr> accelerator_vector;
 
   for (const ui::Accelerator& accelerator : accelerators)
     AddAcceleratorToVector(accelerator, accelerator_vector);
 
   window_manager_->window_manager_client()->AddAccelerators(
       std::move(accelerator_vector),
       base::Bind(OnAcceleratorsAdded, accelerators));
 }
 
 void AcceleratorControllerRegistrar::OnAcceleratorUnregistered(
     const ui::Accelerator& accelerator) {
   auto iter = accelerator_to_ids_.find(accelerator);
   DCHECK(iter != accelerator_to_ids_.end());
   Ids ids = iter->second;
   accelerator_to_ids_.erase(iter);
   ids_.erase(ids.pre_id);
   ids_.erase(ids.post_id);
   DCHECK_EQ(accelerator_to_ids_.size() * 2, ids_.size());
   window_manager_->window_manager_client()->RemoveAccelerator(
       ComputeAcceleratorId(id_namespace_, ids.pre_id));
   window_manager_->window_manager_client()->RemoveAccelerator(
       ComputeAcceleratorId(id_namespace_, ids.post_id));
 }
 
 void AcceleratorControllerRegistrar::AddAcceleratorToVector(
     const ui::Accelerator& accelerator,
-    std::vector<ui::mojom::AcceleratorPtr>& accelerator_vector) {
+    std::vector<ui::mojom::WmAcceleratorPtr>& accelerator_vector) {
   Ids ids;
   if (!GenerateIds(&ids)) {
     LOG(ERROR) << "max number of accelerators registered, dropping request";
     return;
   }
   DCHECK_EQ(0u, accelerator_to_ids_.count(accelerator));
   accelerator_to_ids_[accelerator] = ids;
   DCHECK_EQ(accelerator_to_ids_.size() * 2, ids_.size());
 
   ui::mojom::EventMatcherPtr pre_event_matcher = ui::CreateKeyMatcher(
@@ skipping 34 matching lines @@
   // Common case is we never wrap once, so this is typically cheap. Additionally
   // we expect there not to be too many accelerators.
   while (ids_.count(next_id_) > 0)
     ++next_id_;
   ids_.insert(next_id_);
   return next_id_++;
 }
 
 }  // namespace mus
 }  // namespace ash