diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 16:18:04 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 16:18:04 +0000 |
commit | 850dc30e30f7166990835195f594556b1de3716b (patch) | |
tree | 1d01e5f899bed779963dac5ac08a4ee77116ae2e /chrome/renderer/renderer_resources.grd | |
parent | 2227422a7ddc1bdd9d6f37644a4d3da8fcea087c (diff) | |
download | chromium_src-850dc30e30f7166990835195f594556b1de3716b.zip chromium_src-850dc30e30f7166990835195f594556b1de3716b.tar.gz chromium_src-850dc30e30f7166990835195f594556b1de3716b.tar.bz2 |
linux: implement the sad plugin
This required moving the sad plugin resource out of the Windows-specific code.
Note that it doesn't display right yet, since the place to display is covered
by the GtkSocket that used to host the plugin. But that is a separate issue.
(I had it draw to the side to verify the image was correctly getting loaded.)
BUG=16158
Review URL: http://codereview.chromium.org/155262
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_resources.grd')
-rw-r--r-- | chrome/renderer/renderer_resources.grd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd index d16c963..241abb3 100644 --- a/chrome/renderer/renderer_resources.grd +++ b/chrome/renderer/renderer_resources.grd @@ -19,6 +19,7 @@ without changes to the corresponding grd file. mp6 --> <include name="IDR_JSON_SCHEMA_JS" file="resources\json_schema.js" type="BINDATA" /> <include name="IDR_NET_ERROR_HTML" file="resources\neterror.html" type="BINDATA" /> <include name="IDR_RENDERER_EXTENSION_BINDINGS_JS" file="resources\renderer_extension_bindings.js" type="BINDATA" /> + <include name="IDR_SAD_PLUGIN" file="resources\sadplugin.png" type="BINDATA" /> </includes> </release> </grit> |