Refine VRDevice Class

device/vr/vr_device_manager.cc

 // Copyright 2015 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 "device/vr/vr_device_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 52 matching lines @@
   // For testing. Checks to see if a VRDeviceManager instance is active.
   return !!g_vr_device_manager;
 }
 
 void VRDeviceManager::AddService(VRServiceImpl* service) {
   // Loop through any currently active devices and send Connected messages to
   // the service. Future devices that come online will send a Connected message
   // when they are created.
   GetVRDevices(service);
 
-  services_.push_back(service);
+  services_.insert(service);
 }
 
 void VRDeviceManager::RemoveService(VRServiceImpl* service) {
-  services_.erase(std::remove(services_.begin(), services_.end(), service),
-                  services_.end());
-
-  for (auto device : devices_) {
-    device.second->RemoveService(service);
-  }
 
   if (service->listening_for_activate()) {
     ListeningForActivateChanged(false);
   }
 
+  services_.erase(service);
+
   if (services_.empty() && !keep_alive_) {
     // Delete the device manager when it has no active connections.
     delete g_vr_device_manager;
   }
 }
 
 bool VRDeviceManager::GetVRDevices(VRServiceImpl* service) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   InitializeProviders();
 
   std::vector<VRDevice*> devices;
   for (const auto& provider : providers_)
     provider->GetDevices(&devices);
 
   if (devices.empty())
     return false;
 
   for (auto* device : devices) {
     if (device->id() == VR_DEVICE_LAST_ID)
       continue;
 
     if (devices_.find(device->id()) == devices_.end())
       devices_[device->id()] = device;
 
-    device->AddService(service);
+    // Create a VRDisplayImpl for this service/device pair and attach
+    // the VRDisplayImpl to the device.
+    VRDisplayImpl* display_impl = service->GetVRDisplayImpl(device);
+    device->AddDisplay(display_impl);
   }
 
   return true;
 }
 
 unsigned int VRDeviceManager::GetNumberOfConnectedDevices() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   return static_cast<unsigned int>(devices_.size());
 }
@@ skipping 64 matching lines @@
   for (const auto& provider : providers_)
     provider->PollEvents();
 }
 
 void VRDeviceManager::StopSchedulingPollEvents() {
   if (has_scheduled_poll_)
     timer_.Stop();
 }
 
 }  // namespace device