Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: ui/events/devices/device_data_manager.h

Issue 1202383002: Changed DeviceDataManager to be able to create multiple instances for the purposes of test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed DeviceDataManagerX11 singleton instance to be deleted at exit. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/events/devices/device_data_manager.h
diff --git a/ui/events/devices/device_data_manager.h b/ui/events/devices/device_data_manager.h
index d8ede81f22d885982daf0997bcbba8d56b94df00..2975b9fe77eddd452a59d76ad388778f9b4e5bb4 100644
--- a/ui/events/devices/device_data_manager.h
+++ b/ui/events/devices/device_data_manager.h
@@ -30,6 +30,7 @@ class EVENTS_DEVICES_EXPORT DeviceDataManager
~DeviceDataManager() override;
static void CreateInstance();
+ static void DeleteInstance();
static DeviceDataManager* GetInstance();
static bool HasInstance();
@@ -63,6 +64,8 @@ class EVENTS_DEVICES_EXPORT DeviceDataManager
static DeviceDataManager* instance();
+ static void set_instance(DeviceDataManager* instance);
+
// DeviceHotplugEventObserver:
void OnTouchscreenDevicesUpdated(
const std::vector<TouchscreenDevice>& devices) override;
« no previous file with comments | « no previous file | ui/events/devices/device_data_manager.cc » ('j') | ui/events/devices/x11/device_data_manager_x11.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698