diff options
| -rw-r--r-- | chrome/renderer/extensions/js_only_v8_extensions.cc | 3 | ||||
| -rw-r--r-- | chrome/renderer/renderer_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/renderer/resources/base.js (renamed from webkit/glue/devtools/js/base.js) | 0 | ||||
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 1 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 1 |
5 files changed, 2 insertions, 4 deletions
diff --git a/chrome/renderer/extensions/js_only_v8_extensions.cc b/chrome/renderer/extensions/js_only_v8_extensions.cc index 94b12be..359e756 100644 --- a/chrome/renderer/extensions/js_only_v8_extensions.cc +++ b/chrome/renderer/extensions/js_only_v8_extensions.cc @@ -6,7 +6,6 @@ #include "chrome/renderer/extensions/bindings_utils.h" #include "grit/renderer_resources.h" -#include "grit/webkit_resources.h" using bindings_utils::GetStringResource; @@ -15,7 +14,7 @@ const char* BaseJsV8Extension::kName = "chrome/base"; v8::Extension* BaseJsV8Extension::Get() { static v8::Extension* extension = new bindings_utils::ExtensionBase( - kName, GetStringResource<IDR_DEVTOOLS_BASE_JS>(), 0, NULL); + kName, GetStringResource<IDR_BASE_JS>(), 0, NULL); return extension; } diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd index 401c68e..15c8f90 100644 --- a/chrome/renderer/renderer_resources.grd +++ b/chrome/renderer/renderer_resources.grd @@ -22,6 +22,7 @@ without changes to the corresponding grd file. fb9 --> <include name="IDR_SAD_PLUGIN" file="resources\sadplugin.png" type="BINDATA" /> <include name="IDR_EXTENSION_APITEST_JS" file="resources\extension_apitest.js" type="BINDATA" /> <include name="IDR_EXTENSION_TOOLSTRIP_CSS" file="resources\extension_toolstrip.css" flattenhtml="true" type="BINDATA" /> + <include name="IDR_BASE_JS" file="resources\base.js" type="BINDATA" /> </includes> </release> </grit> diff --git a/webkit/glue/devtools/js/base.js b/chrome/renderer/resources/base.js index 1a76aee..1a76aee 100644 --- a/webkit/glue/devtools/js/base.js +++ b/chrome/renderer/resources/base.js diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index 3c9f380..29dd456 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -18,7 +18,6 @@ <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_BASE_JS" file="devtools\js\base.js" type="BINDATA" /> <include name="IDR_DEVTOOLS_INJECT_DISPATCH_JS" file="devtools\js\inject_dispatch.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" /> diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 6552b0e..b553ee9 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -779,7 +779,6 @@ base::StringPiece GetDataResource(int resource_id) { case IDR_MEDIA_SLIDER_THUMB: case IDR_MEDIA_VOLUME_SLIDER_THUMB: case IDR_DEVTOOLS_INJECT_WEBKIT_JS: - case IDR_DEVTOOLS_BASE_JS: case IDR_DEVTOOLS_INJECT_DISPATCH_JS: return NetResourceProvider(resource_id); |