diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 05:36:38 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 05:36:38 +0000 |
| commit | 0d64bb701b65d583ad7439afe3188df055fd0e04 (patch) | |
| tree | e1840ec5212e743b1821c3c4d19f0e416f17313c /chrome/app/chrome_dll.rc | |
| parent | 4f1629ad859f74144d79974eb81867c6324e0894 (diff) | |
| download | chromium_src-0d64bb701b65d583ad7439afe3188df055fd0e04.zip chromium_src-0d64bb701b65d583ad7439afe3188df055fd0e04.tar.gz chromium_src-0d64bb701b65d583ad7439afe3188df055fd0e04.tar.bz2 | |
Move default_plugin from webkit/ to chrome/
Second try, first try at http://codereview.chromium.org/2803035 . Also contains http://codereview.chromium.org/2838044 , changes to DEPS files (mostly cleanups), and a change to webkit/glue/plugins/webplugin_delegate_impl_win.cc .
BUG= 48419
TEST=everything still builds
Review URL: http://codereview.chromium.org/2813047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll.rc')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index ab241c6..1ab9514 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -262,7 +262,7 @@ END // 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" +#include "chrome\\default_plugin\\default_plugin_resources.rc" #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// |