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

Unified Diff: chrome/browser/chrome_device_client.cc

Issue 2482463002: Remove DeviceMonitorLinux::WillDestroyCurrentMessageLoop(). (Closed)
Patch Set: CR achuithb #24 Created 4 years, 1 month 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 | « chrome/browser/chrome_device_client.h ('k') | chrome/browser/chromeos/device/input_service_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_device_client.cc
diff --git a/chrome/browser/chrome_device_client.cc b/chrome/browser/chrome_device_client.cc
index 7ce9c4fe5535beabc8b9500ef2fadbf168c5fee2..e6165258aa7f00f805c4f3542de247519de4b0ef 100644
--- a/chrome/browser/chrome_device_client.cc
+++ b/chrome/browser/chrome_device_client.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/chrome_device_client.h"
-#include "base/logging.h"
#include "build/build_config.h"
#include "content/public/browser/browser_thread.h"
#include "device/hid/hid_service.h"
@@ -14,7 +13,21 @@ using content::BrowserThread;
ChromeDeviceClient::ChromeDeviceClient() {}
-ChromeDeviceClient::~ChromeDeviceClient() {}
+ChromeDeviceClient::~ChromeDeviceClient() {
+#if DCHECK_IS_ON()
+ DCHECK(did_shutdown_);
+#endif
+}
+
+void ChromeDeviceClient::Shutdown() {
+ if (usb_service_)
+ usb_service_->Shutdown();
+ if (hid_service_)
+ hid_service_->Shutdown();
+#if DCHECK_IS_ON()
+ did_shutdown_ = true;
+#endif
+}
device::UsbService* ChromeDeviceClient::GetUsbService() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
« no previous file with comments | « chrome/browser/chrome_device_client.h ('k') | chrome/browser/chromeos/device/input_service_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698