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

Unified Diff: chrome/browser/devtools/device/android_device_manager.cc

Issue 287643002: DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Used scoped_ptr. Fixed DeviceHandle destruction Created 6 years, 7 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: chrome/browser/devtools/device/android_device_manager.cc
diff --git a/chrome/browser/devtools/device/android_device_manager.cc b/chrome/browser/devtools/device/android_device_manager.cc
index 6184fe560fee2fc06495a6f00918d12742ff49ab..7d00f2d2c614a63c868edf722db761a34904c14a 100644
--- a/chrome/browser/devtools/device/android_device_manager.cc
+++ b/chrome/browser/devtools/device/android_device_manager.cc
@@ -218,15 +218,13 @@ void AndroidDeviceManager::QueryDevices(
const DeviceProviders& providers,
const QueryDevicesCallback& callback) {
DCHECK(CalledOnValidThread());
- stopped_ = false;
Devices empty;
QueryNextProvider(callback, providers, empty, empty);
}
-void AndroidDeviceManager::Stop() {
+void AndroidDeviceManager::ReleaseDevice(const std::string& serial) {
pfeldman 2014/05/21 11:33:41 What if different clients query and release device
DCHECK(CalledOnValidThread());
- stopped_ = true;
- devices_.clear();
+ devices_.erase(serial);
}
bool AndroidDeviceManager::IsConnected(const std::string& serial) {
@@ -288,8 +286,7 @@ void AndroidDeviceManager::HttpUpgrade(
}
}
-AndroidDeviceManager::AndroidDeviceManager()
- : stopped_(false) {
+AndroidDeviceManager::AndroidDeviceManager() {
}
AndroidDeviceManager::~AndroidDeviceManager() {
@@ -302,9 +299,6 @@ void AndroidDeviceManager::QueryNextProvider(
const Devices& new_devices) {
DCHECK(CalledOnValidThread());
- if (stopped_)
- return;
-
Devices more_devices(total_devices);
more_devices.insert(
more_devices.end(), new_devices.begin(), new_devices.end());

Powered by Google App Engine
This is Rietveld 408576698