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

Unified Diff: device/core/device_monitor_win.cc

Issue 1074963003: Clean up potentially leaky use of base::DeletePointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed another probleb Created 5 years, 8 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
« no previous file with comments | « dbus/object_proxy.cc ('k') | device/hid/hid_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/core/device_monitor_win.cc
diff --git a/device/core/device_monitor_win.cc b/device/core/device_monitor_win.cc
index 3449c82350e658b5b93379141946f63a8ce993cc..5048741b45e591ac767cc95b41108b63ccd9425b 100644
--- a/device/core/device_monitor_win.cc
+++ b/device/core/device_monitor_win.cc
@@ -42,8 +42,7 @@ class DeviceMonitorMessageWindow {
g_message_window = new DeviceMonitorMessageWindow();
if (g_message_window->Init()) {
base::AtExitManager::RegisterTask(
- base::Bind(&base::DeletePointer<DeviceMonitorMessageWindow>,
- base::Unretained(g_message_window)));
+ base::Bind(&DeviceMonitorMessageWindow::Delete));
} else {
delete g_message_window;
g_message_window = nullptr;
@@ -64,9 +63,10 @@ class DeviceMonitorMessageWindow {
DeviceMonitorWin* GetForAllInterfaces() { return &all_device_monitor_; }
private:
- friend void base::DeletePointer<DeviceMonitorMessageWindow>(
- DeviceMonitorMessageWindow* message_window);
-
+ static void Delete() {
+ delete g_message_window;
+ g_message_window = nullptr;
+ }
DeviceMonitorMessageWindow() {
}
« no previous file with comments | « dbus/object_proxy.cc ('k') | device/hid/hid_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698