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

Unified Diff: tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py

Issue 1001393002: Telemetry: Don't expose ListInspectableContexts from DevtoolsClientBackend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@telemetry_dont_expose_devtools_http
Patch Set: Created 5 years, 9 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: tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py
index 3c1d21a28e035a9f5f2066527ef0eb6ce29e0bbc..6e5935f1371c174121eb0a8e963e435bfc826ad5 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend.py
@@ -103,10 +103,7 @@ class DevToolsClientBackend(object):
# Branch number can't be determined, so fail any branch number checks.
return 0
- # TODO(chrishenry): This is exposed tempoarily during DevTools code
- # refactoring. Instead, we should expose InspectorBackendList or
- # equivalent. crbug.com/423954.
- def ListInspectableContexts(self):
+ def _ListInspectableContexts(self):
return self._devtools_http.RequestJson('')
def CreateNewTab(self, timeout):
@@ -147,9 +144,29 @@ class DevToolsClientBackend(object):
'Unable to activate tab, tab id not found: %s' % tab_id)
raise error, None, sys.exc_info()[2]
+ def GetUrl(self, tab_id):
erikchen 2015/03/13 18:20:25 It's unexpected for accessing a property to throw
+ """Returns the URL of the tab with |tab_id|, as reported by devtools.
+
+ Raises:
+ devtools_http.DevToolsClientConnectionError
+ """
+ for c in self._ListInspectableContexts():
+ if c['id'] == tab_id:
+ return c['url']
+ return None
+
+ def IsInspectable(self, tab_id):
+ """Whether the tab with |tab_id| is inspectable, as reported by devtools.
+
+ Raises:
+ devtools_http.DevToolsClientConnectionError
+ """
+ contexts = self._ListInspectableContexts()
+ return tab_id in [c['id'] for c in contexts]
+
def GetUpdatedInspectableContexts(self):
"""Returns an updated instance of _DevToolsContextMapBackend."""
- contexts = self.ListInspectableContexts()
+ contexts = self._ListInspectableContexts()
self._devtools_context_map_backend._Update(contexts)
return self._devtools_context_map_backend

Powered by Google App Engine
This is Rietveld 408576698