diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 23:32:29 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 23:32:29 +0000 |
| commit | a0a81442d80fda67fab9108e9018b8750da115b6 (patch) | |
| tree | bec38608be3ccfd2da6786375fe33a0347797ef4 /ppapi/shared_impl | |
| parent | d5f8440640aab5a07b1c98fe38e488e48362a6af (diff) | |
| download | chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.zip chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.tar.gz chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.tar.bz2 | |
Revert 203261 "split webkit/glue/webpreferences to common and re..."
Broke compile
> split webkit/glue/webpreferences to common and renderer
>
> TBR=jamesr@chromium.org
>
> BUG=239107
>
> Review URL: https://codereview.chromium.org/16216007
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/16232014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl')
| -rw-r--r-- | ppapi/shared_impl/DEPS | 2 | ||||
| -rw-r--r-- | ppapi/shared_impl/ppapi_preferences.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/shared_impl/DEPS b/ppapi/shared_impl/DEPS index 313cbac..9f93141 100644 --- a/ppapi/shared_impl/DEPS +++ b/ppapi/shared_impl/DEPS @@ -3,7 +3,7 @@ include_rules = [ "+gpu", "+media/audio", "+skia", - "+webkit/common/webpreferences.h", + "+webkit/glue", # The untrusted build references the NaCl integrated runtime (IRT). "+native_client/src/untrusted/irt", diff --git a/ppapi/shared_impl/ppapi_preferences.h b/ppapi/shared_impl/ppapi_preferences.h index d3fad965..852f7b9 100644 --- a/ppapi/shared_impl/ppapi_preferences.h +++ b/ppapi/shared_impl/ppapi_preferences.h @@ -6,7 +6,7 @@ #define PPAPI_SHARED_IMPL_PPAPI_PREFERENCES_H_ #include "ppapi/shared_impl/ppapi_shared_export.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" struct WebPreferences; |