summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/npapi
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 18:27:06 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 18:27:06 +0000
commit9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634 (patch)
tree3b7332926a05a1c8382eb27422c385b56b29cb24 /webkit/plugins/npapi
parenta12f7fbe12afffb4b1b31ec0d6b0988f1f9a6554 (diff)
downloadchromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.zip
chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.gz
chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.bz2
Move a bunch of random other files to src/ui/base
BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6257006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi')
-rw-r--r--webkit/plugins/npapi/DEPS3
-rw-r--r--webkit/plugins/npapi/webplugin_delegate_impl.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/plugins/npapi/DEPS b/webkit/plugins/npapi/DEPS
index c3cbc8c..3ebbd9e 100644
--- a/webkit/plugins/npapi/DEPS
+++ b/webkit/plugins/npapi/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+app",
+ "+app", # app/win/iat_patch_function.h
"+ppapi",
# Files in this directory must not depend on the proxy, because the proxy
@@ -8,4 +8,5 @@ include_rules = [
"+printing",
"+skia",
+ "+ui/base",
]
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h
index 84131f2..9f64f3a 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl.h
+++ b/webkit/plugins/npapi/webplugin_delegate_impl.h
@@ -21,7 +21,7 @@
#include "webkit/glue/webcursor.h"
#if defined(USE_X11)
-#include "app/x11_util.h"
+#include "ui/base/x/x11_util.h"
typedef struct _GdkDrawable GdkPixmap;
#endif