summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_resources.grd
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 10:12:43 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 10:12:43 +0000
commitfdf71d98ccfdef8616b9a76e484bb7a803fe8280 (patch)
treea8ce21669b4d1e547c23c76d7fdb2bb0231295bd /webkit/glue/webkit_resources.grd
parent84466968475088bf0f7ea837a215dec061d5eb41 (diff)
downloadchromium_src-fdf71d98ccfdef8616b9a76e484bb7a803fe8280.zip
chromium_src-fdf71d98ccfdef8616b9a76e484bb7a803fe8280.tar.gz
chromium_src-fdf71d98ccfdef8616b9a76e484bb7a803fe8280.tar.bz2
DevTools: switch to upstreamed version of DevTools *.js files. Second attempt to land the patch 598014. Now with concatenated file name changed from devtools.js to DevTools.js
BUG=34411 Review URL: http://codereview.chromium.org/601025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_resources.grd')
-rw-r--r--webkit/glue/webkit_resources.grd2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 29dd456..8322236 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -18,7 +18,7 @@
<include name="IDR_SEARCH_MAGNIFIER" file="resources\search_magnifier.png" type="BINDATA" />
<include name="IDR_SEARCH_MAGNIFIER_RESULTS" file="resources\search_magnifier_results.png" type="BINDATA" />
<include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" />
- <include name="IDR_DEVTOOLS_INJECT_DISPATCH_JS" file="devtools\js\inject_dispatch.js" type="BINDATA" />
+ <include name="IDR_DEVTOOLS_INJECT_DISPATCH_JS" file="..\..\third_party\WebKit\WebKit\chromium\src\js\InjectDispatch.js" type="BINDATA"/>
<include name="IDR_DEVTOOLS_INJECT_WEBKIT_JS" file="..\..\third_party\WebKit\WebCore\inspector\front-end\InjectedScript.js" type="BINDATA"/>
<include name="IDR_MEDIA_PLAY_BUTTON" file="resources\media_play.png" type="BINDATA" />
<include name="IDR_MEDIA_PLAY_BUTTON_DISABLED" file="resources\media_play_disabled.png" type="BINDATA" />