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

Unified Diff: chrome/browser/devtools/devtools_targets_ui.cc

Issue 1109483003: [DevTools] Migrate chrome to devtools_discovery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@devtools-discovery-android
Patch Set: rebased 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
Index: chrome/browser/devtools/devtools_targets_ui.cc
diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc
index adaa84bdec03697be02ed051cb6d2ea13affa939..498c5c3ee2d2d4154951019e05be120c7207a7d5 100644
--- a/chrome/browser/devtools/devtools_targets_ui.cc
+++ b/chrome/browser/devtools/devtools_targets_ui.cc
@@ -169,7 +169,7 @@ private:
void ScheduleUpdate();
void UpdateTargets();
- void SendTargets(const DevToolsTargetImpl::List& targets);
+ void SendTargets(const std::vector<DevToolsTargetImpl*>& targets);
content::NotificationRegistrar notification_registrar_;
scoped_ptr<CancelableTimer> timer_;
@@ -222,20 +222,16 @@ void LocalTargetsUIHandler::ScheduleUpdate() {
}
void LocalTargetsUIHandler::UpdateTargets() {
- DevToolsTargetImpl::EnumerateAllTargets(base::Bind(
- &LocalTargetsUIHandler::SendTargets,
- weak_factory_.GetWeakPtr()));
+ SendTargets(DevToolsTargetImpl::EnumerateAll());
}
void LocalTargetsUIHandler::SendTargets(
- const DevToolsTargetImpl::List& targets) {
+ const std::vector<DevToolsTargetImpl*>& targets) {
base::ListValue list_value;
std::map<std::string, base::DictionaryValue*> id_to_descriptor;
STLDeleteValues(&targets_);
- for (DevToolsTargetImpl::List::const_iterator it = targets.begin();
- it != targets.end(); ++it) {
- DevToolsTargetImpl* target = *it;
+ for (DevToolsTargetImpl* target : targets) {
targets_[target->GetId()] = target;
id_to_descriptor[target->GetId()] = Serialize(*target);
}
« no previous file with comments | « chrome/browser/devtools/devtools_target_impl.cc ('k') | chrome/browser/extensions/api/debugger/debugger_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698