diff options
| author | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
| commit | 116680a4aac90f2aa7413d9095a592090648e557 (patch) | |
| tree | f7c6fed0e63d6a2804243d4a31a752dca39fb076 /content/browser/child_process_security_policy_impl.h | |
| parent | 1f14a4515e04c9ffc9bac4dd1e2f68611626b800 (diff) | |
| download | chromium_org-116680a4aac90f2aa7413d9095a592090648e557.tar.gz | |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
Diffstat (limited to 'content/browser/child_process_security_policy_impl.h')
| -rw-r--r-- | content/browser/child_process_security_policy_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h index 005292cdf2..08479f2a6b 100644 --- a/content/browser/child_process_security_policy_impl.h +++ b/content/browser/child_process_security_policy_impl.h @@ -15,8 +15,8 @@ #include "base/memory/singleton.h" #include "base/synchronization/lock.h" #include "content/public/browser/child_process_security_policy.h" +#include "content/public/common/resource_type.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/common/resource_type.h" class GURL; |