diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 18:29:54 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 18:29:54 +0000 |
| commit | 43ebb4d08c62012d6719646edb93f44e45e01d42 (patch) | |
| tree | 862e4f34be0407f98f4be59015e85953b51a8af6 /chrome | |
| parent | 235c17a4631e92a4cbd214863758165a2f573801 (diff) | |
| download | chromium_src-43ebb4d08c62012d6719646edb93f44e45e01d42.zip chromium_src-43ebb4d08c62012d6719646edb93f44e45e01d42.tar.gz chromium_src-43ebb4d08c62012d6719646edb93f44e45e01d42.tar.bz2 | |
Move default plugin resources into separate .h and .rc files
from the other webkit resources. I'm going to convert
webkit_resources.rc to a cross platform .grd file so I'm moving
the windows specific default plugin code into a separate file.
Review URL: http://codereview.chromium.org/17306
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 3f4f3e2..07cf3ca 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -235,6 +235,10 @@ END #include "installer_util_strings.rc" +// We include these resources because all ICON types need to be in the +// same .rc file. See: +// http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111.aspx +#include "webkit\\default_plugin\\default_plugin_resources.rc" #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -245,5 +249,3 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - - |