summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorserya <serya@chromium.org>2014-12-03 19:06:36 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-04 03:06:53 +0000
commit91af3ad699d1067d8398b42a6f1fad737b95b12b (patch)
treea2b79c0c86febbedcc277cfa5fbc18738bcd326b /tools
parent06c1b216dcc90b933ae3c89a29182bc6a6dea646 (diff)
downloadchromium_src-91af3ad699d1067d8398b42a6f1fad737b95b12b.zip
chromium_src-91af3ad699d1067d8398b42a6f1fad737b95b12b.tar.gz
chromium_src-91af3ad699d1067d8398b42a6f1fad737b95b12b.tar.bz2
Device provider for chrome://inspect that connects to DevTools bridge (components/devtools_bridge).
It hosts a WebContents to run WebRTC and GCD related code BUG=383418 Review URL: https://codereview.chromium.org/746663002 Cr-Commit-Position: refs/heads/master@{#306755}
Diffstat (limited to 'tools')
-rw-r--r--tools/gritsettings/resource_ids3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index f80cdd0..42cc710 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -234,6 +234,9 @@
"third_party/WebKit/public/blink_resources.grd": {
"includes": [30500],
},
+ "chrome/browser/devtools/device/webrtc/resources.grd": {
+ "includes": [30800],
+ },
# These files don't need to reserve resource ids, but are listed here so that
# translation scripts know of their existence.