Commit fac225ce authored by maksim.sisov's avatar maksim.sisov Committed by Commit bot

[sensors](CrOS/Linux) Rename SensorDeviceManager cc and h files.

It is a followup patch to https://codereview.chromium.org/2533793002/
In addition to renaming this CL fixes a typo in code where sensor
cache in erased.

BUG=606766

Review-Url: https://codereview.chromium.org/2560263002
Cr-Commit-Position: refs/heads/master@{#437778}
parent 3c957a58
...@@ -77,8 +77,8 @@ component("generic_sensor") { ...@@ -77,8 +77,8 @@ component("generic_sensor") {
] ]
sources += [ sources += [
"linux/platform_sensor_manager.cc", "linux/sensor_device_manager.cc",
"linux/platform_sensor_manager.h", "linux/sensor_device_manager.h",
"platform_sensor_provider_linux.cc", "platform_sensor_provider_linux.cc",
"platform_sensor_provider_linux.h", "platform_sensor_provider_linux.h",
] ]
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "device/generic_sensor/linux/platform_sensor_manager.h" #include "device/generic_sensor/linux/sensor_device_manager.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef DEVICE_GENERIC_SENSOR_LINUX_PLATFORM_SENSOR_MANAGER_H_ #ifndef DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_
#define DEVICE_GENERIC_SENSOR_LINUX_PLATFORM_SENSOR_MANAGER_H_ #define DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_
#include "base/scoped_observer.h" #include "base/scoped_observer.h"
...@@ -80,4 +80,4 @@ class DEVICE_GENERIC_SENSOR_EXPORT SensorDeviceManager ...@@ -80,4 +80,4 @@ class DEVICE_GENERIC_SENSOR_EXPORT SensorDeviceManager
} // namespace device } // namespace device
#endif // DEVICE_GENERIC_SENSOR_LINUX_PLATFORM_SENSOR_MANAGER_H_ #endif // DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "device/generic_sensor/generic_sensor_consts.h" #include "device/generic_sensor/generic_sensor_consts.h"
#include "device/generic_sensor/linux/platform_sensor_manager.h"
#include "device/generic_sensor/linux/sensor_data_linux.h" #include "device/generic_sensor/linux/sensor_data_linux.h"
#include "device/generic_sensor/linux/sensor_device_manager.h"
#include "device/generic_sensor/platform_sensor_provider_linux.h" #include "device/generic_sensor/platform_sensor_provider_linux.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
......
...@@ -202,7 +202,7 @@ void PlatformSensorProviderLinux::OnDeviceRemoved( ...@@ -202,7 +202,7 @@ void PlatformSensorProviderLinux::OnDeviceRemoved(
const std::string& device_node) { const std::string& device_node) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
auto it = sensor_devices_by_type_.find(type); auto it = sensor_devices_by_type_.find(type);
if (it == sensor_devices_by_type_.end() && if (it != sensor_devices_by_type_.end() &&
it->second->device_node == device_node) it->second->device_node == device_node)
sensor_devices_by_type_.erase(it); sensor_devices_by_type_.erase(it);
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "device/generic_sensor/platform_sensor_provider.h" #include "device/generic_sensor/platform_sensor_provider.h"
#include "device/generic_sensor/linux/platform_sensor_manager.h" #include "device/generic_sensor/linux/sensor_device_manager.h"
namespace base { namespace base {
template <typename T> template <typename T>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment