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

Side by Side Diff: chrome/browser/devtools/devtools_targets_ui.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/devtools/devtools_targets_ui.h" 5 #include "chrome/browser/devtools/devtools_targets_ui.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 void LocalTargetsUIHandler::UpdateTargets() { 228 void LocalTargetsUIHandler::UpdateTargets() {
229 SendTargets(DevToolsTargetImpl::EnumerateAll()); 229 SendTargets(DevToolsTargetImpl::EnumerateAll());
230 } 230 }
231 231
232 void LocalTargetsUIHandler::SendTargets( 232 void LocalTargetsUIHandler::SendTargets(
233 const std::vector<DevToolsTargetImpl*>& targets) { 233 const std::vector<DevToolsTargetImpl*>& targets) {
234 base::ListValue list_value; 234 base::ListValue list_value;
235 std::map<std::string, base::DictionaryValue*> id_to_descriptor; 235 std::map<std::string, base::DictionaryValue*> id_to_descriptor;
236 236
237 STLDeleteValues(&targets_); 237 base::STLDeleteValues(&targets_);
238 for (DevToolsTargetImpl* target : targets) { 238 for (DevToolsTargetImpl* target : targets) {
239 targets_[target->GetId()] = target; 239 targets_[target->GetId()] = target;
240 id_to_descriptor[target->GetId()] = Serialize(*target); 240 id_to_descriptor[target->GetId()] = Serialize(*target);
241 } 241 }
242 242
243 for (TargetMap::iterator it(targets_.begin()); it != targets_.end(); ++it) { 243 for (TargetMap::iterator it(targets_.begin()); it != targets_.end(); ++it) {
244 DevToolsTargetImpl* target = it->second; 244 DevToolsTargetImpl* target = it->second;
245 base::DictionaryValue* descriptor = id_to_descriptor[target->GetId()]; 245 base::DictionaryValue* descriptor = id_to_descriptor[target->GetId()];
246 std::string parent_id = target->GetParentId(); 246 std::string parent_id = target->GetParentId();
247 if (parent_id.empty() || id_to_descriptor.count(parent_id) == 0) { 247 if (parent_id.empty() || id_to_descriptor.count(parent_id) == 0) {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 RemoteBrowsers::iterator it = remote_browsers_.find(browser_id); 317 RemoteBrowsers::iterator it = remote_browsers_.find(browser_id);
318 if (it == remote_browsers_.end() || !android_bridge_) 318 if (it == remote_browsers_.end() || !android_bridge_)
319 return nullptr; 319 return nullptr;
320 320
321 return android_bridge_->GetBrowserAgentHost(it->second); 321 return android_bridge_->GetBrowserAgentHost(it->second);
322 } 322 }
323 323
324 void AdbTargetsUIHandler::DeviceListChanged( 324 void AdbTargetsUIHandler::DeviceListChanged(
325 const DevToolsAndroidBridge::RemoteDevices& devices) { 325 const DevToolsAndroidBridge::RemoteDevices& devices) {
326 remote_browsers_.clear(); 326 remote_browsers_.clear();
327 STLDeleteValues(&targets_); 327 base::STLDeleteValues(&targets_);
328 if (!android_bridge_) 328 if (!android_bridge_)
329 return; 329 return;
330 330
331 base::ListValue device_list; 331 base::ListValue device_list;
332 for (DevToolsAndroidBridge::RemoteDevices::const_iterator dit = 332 for (DevToolsAndroidBridge::RemoteDevices::const_iterator dit =
333 devices.begin(); dit != devices.end(); ++dit) { 333 devices.begin(); dit != devices.end(); ++dit) {
334 DevToolsAndroidBridge::RemoteDevice* device = dit->get(); 334 DevToolsAndroidBridge::RemoteDevice* device = dit->get();
335 std::unique_ptr<base::DictionaryValue> device_data( 335 std::unique_ptr<base::DictionaryValue> device_data(
336 new base::DictionaryValue()); 336 new base::DictionaryValue());
337 device_data->SetString(kAdbModelField, device->model()); 337 device_data->SetString(kAdbModelField, device->model());
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 // DevToolsTargetsUIHandler --------------------------------------------------- 394 // DevToolsTargetsUIHandler ---------------------------------------------------
395 395
396 DevToolsTargetsUIHandler::DevToolsTargetsUIHandler( 396 DevToolsTargetsUIHandler::DevToolsTargetsUIHandler(
397 const std::string& source_id, 397 const std::string& source_id,
398 const Callback& callback) 398 const Callback& callback)
399 : source_id_(source_id), 399 : source_id_(source_id),
400 callback_(callback) { 400 callback_(callback) {
401 } 401 }
402 402
403 DevToolsTargetsUIHandler::~DevToolsTargetsUIHandler() { 403 DevToolsTargetsUIHandler::~DevToolsTargetsUIHandler() {
404 STLDeleteValues(&targets_); 404 base::STLDeleteValues(&targets_);
405 } 405 }
406 406
407 // static 407 // static
408 std::unique_ptr<DevToolsTargetsUIHandler> 408 std::unique_ptr<DevToolsTargetsUIHandler>
409 DevToolsTargetsUIHandler::CreateForLocal( 409 DevToolsTargetsUIHandler::CreateForLocal(
410 const DevToolsTargetsUIHandler::Callback& callback) { 410 const DevToolsTargetsUIHandler::Callback& callback) {
411 return std::unique_ptr<DevToolsTargetsUIHandler>( 411 return std::unique_ptr<DevToolsTargetsUIHandler>(
412 new LocalTargetsUIHandler(callback)); 412 new LocalTargetsUIHandler(callback));
413 } 413 }
414 414
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 device_status_dict->SetString(kPortForwardingBrowserId, 496 device_status_dict->SetString(kPortForwardingBrowserId,
497 sit->first->GetId()); 497 sit->first->GetId());
498 498
499 std::string device_id = base::StringPrintf( 499 std::string device_id = base::StringPrintf(
500 kAdbDeviceIdFormat, 500 kAdbDeviceIdFormat,
501 sit->first->serial().c_str()); 501 sit->first->serial().c_str());
502 result.Set(device_id, device_status_dict); 502 result.Set(device_id, device_status_dict);
503 } 503 }
504 callback_.Run(result); 504 callback_.Run(result);
505 } 505 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/device/tcp_device_provider.cc ('k') | chrome/browser/diagnostics/diagnostics_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698