summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/chrome_dll.rc2
-rw-r--r--chrome/default_plugin/DEPS2
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl_win.cc1
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"