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

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

Issue 568403002: Unify shared and service workers in chrome://inspect, remove service workers iframe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 15e017696e948a69db2ad9e17d4cfb5e81ac0737..e5d96c9705e72ac0415e6a10fa869546483ab8ce 100644
--- a/chrome/browser/devtools/devtools_targets_ui.cc
+++ b/chrome/browser/devtools/devtools_targets_ui.cc
@@ -156,6 +156,9 @@ class LocalTargetsUIHandler
explicit LocalTargetsUIHandler(const Callback& callback);
virtual ~LocalTargetsUIHandler();
+ // DevToolsTargetsUIHandler overrides.
+ virtual void ForceUpdate() OVERRIDE;
+
private:
// content::NotificationObserver overrides.
virtual void Observe(int type,
@@ -203,6 +206,10 @@ void LocalTargetsUIHandler::Observe(
ScheduleUpdate();
}
+void LocalTargetsUIHandler::ForceUpdate() {
+ ScheduleUpdate();
+}
+
void LocalTargetsUIHandler::ScheduleUpdate() {
const int kUpdateDelay = 100;
timer_.reset(
@@ -227,18 +234,13 @@ void LocalTargetsUIHandler::SendTargets(
for (DevToolsTargetImpl::List::const_iterator it = targets.begin();
it != targets.end(); ++it) {
DevToolsTargetImpl* target = *it;
- if (target->GetType() == DevToolsTargetImpl::kTargetTypeServiceWorker)
- continue;
targets_[target->GetId()] = target;
id_to_descriptor[target->GetId()] = Serialize(*target);
}
for (TargetMap::iterator it(targets_.begin()); it != targets_.end(); ++it) {
DevToolsTargetImpl* target = it->second;
- if (target->GetType() == DevToolsTargetImpl::kTargetTypeServiceWorker)
- continue;
base::DictionaryValue* descriptor = id_to_descriptor[target->GetId()];
-
std::string parent_id = target->GetParentId();
if (parent_id.empty() || id_to_descriptor.count(parent_id) == 0) {
list_value.Append(descriptor);
@@ -475,6 +477,9 @@ void DevToolsTargetsUIHandler::SendSerializedTargets(
callback_.Run(source_id_, list);
}
+void DevToolsTargetsUIHandler::ForceUpdate() {
+}
+
// PortForwardingStatusSerializer ---------------------------------------------
PortForwardingStatusSerializer::PortForwardingStatusSerializer(

Powered by Google App Engine
This is Rietveld 408576698