Move touchscreen device caching to DeviceDataManager

ui/display/chromeos/touchscreen_delegate_impl.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 "ui/display/chromeos/touchscreen_delegate_impl.h"
 
 #include <cmath>
 #include <set>
 
 #include "ui/display/types/chromeos/display_mode.h"
 #include "ui/display/types/chromeos/display_snapshot.h"
-#include "ui/display/types/chromeos/touchscreen_device_manager.h"
+#include "ui/events/device_data_manager.h"
 
 namespace ui {
 
-TouchscreenDelegateImpl::TouchscreenDelegateImpl(
-    scoped_ptr<TouchscreenDeviceManager> touch_device_manager)
-    : touch_device_manager_(touch_device_manager.Pass()) {}
+TouchscreenDelegateImpl::TouchscreenDelegateImpl() {
+}
 
 TouchscreenDelegateImpl::~TouchscreenDelegateImpl() {}
 
 void TouchscreenDelegateImpl::AssociateTouchscreens(
     std::vector<DisplayConfigurator::DisplayState>* displays) {
   std::set<int> no_match_touchscreen;
-  std::vector<TouchscreenDevice> devices = touch_device_manager_->GetDevices();
+  std::vector<TouchscreenDevice> devices =

[Daniel Erat, 2014/09/10 19:12:50]

oh, and if you don't actually need to make a copy here, make the local be a
const std::vector<TouchscreenDevice>&; ditto for other callers

[dnicoara, 2014/09/10 19:24:25]

Done.

+      DeviceDataManager::GetInstance()->touchscreen_devices();
 
   int internal_touchscreen = -1;
   for (size_t i = 0; i < devices.size(); ++i) {
     if (devices[i].is_internal) {
       internal_touchscreen = i;
       break;
     }
   }
 
   DisplayConfigurator::DisplayState* internal_state = NULL;
@@ skipping 67 matching lines @@
         VLOG(2) << "Arbitrarily matching touchscreen "
                 << state->touch_device_id << " to display "
                 << state->display->display_id();
         break;
       }
     }
   }
 }
 
 }  // namespace ui