diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 02:43:59 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 02:43:59 +0000 |
| commit | 421fb9a0f6c489c006031c1789848e0565ab485c (patch) | |
| tree | eb2b7fbfa27c75edfa563adf10f93ba855575c38 | |
| parent | 09a0c16b6b6e9189aca7620e5d3bf1e1320478bf (diff) | |
| download | chromium_src-421fb9a0f6c489c006031c1789848e0565ab485c.zip chromium_src-421fb9a0f6c489c006031c1789848e0565ab485c.tar.gz chromium_src-421fb9a0f6c489c006031c1789848e0565ab485c.tar.bz2 | |
Revert 51682 - Build fix attempt.
Parts by hbono.
TBR=tony^work
Review URL: http://codereview.chromium.org/2838044
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2822050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51683 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/chrome_dll.rc | 2 | ||||
| -rw-r--r-- | chrome/default_plugin/DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_win.cc | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 1ab9514..ab241c6 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 "chrome\\default_plugin\\default_plugin_resources.rc" +#include "webkit\\default_plugin\\default_plugin_resources.rc" #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/chrome/default_plugin/DEPS b/chrome/default_plugin/DEPS index c004887..a24c01b 100644 --- a/chrome/default_plugin/DEPS +++ b/chrome/default_plugin/DEPS @@ -1,6 +1,4 @@ include_rules = [ "+app", - "+grit", # For generated headers "+third_party/libxml", - "+webkit/glue", ] diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc index 94f621e..6da9333 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc @@ -18,6 +18,7 @@ #include "base/win_util.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "webkit/default_plugin/plugin_impl.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/plugin_instance.h" #include "webkit/glue/plugins/plugin_lib.h" |