diff options
| author | mek <mek@chromium.org> | 2016-02-04 15:39:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-04 23:40:04 +0000 |
| commit | 966863cf85ce76b95f0c457ecdc784dbf8500fcb (patch) | |
| tree | d88b36e90492f4e71623f9639b07ff684d9f47f5 /extensions | |
| parent | 8d2c455e9416e87f5e8bf06876f374343ff1c4a2 (diff) | |
| download | chromium_src-966863cf85ce76b95f0c457ecdc784dbf8500fcb.zip chromium_src-966863cf85ce76b95f0c457ecdc784dbf8500fcb.tar.gz chromium_src-966863cf85ce76b95f0c457ecdc784dbf8500fcb.tar.bz2 | |
Delete WebKit/public/web/WebSecurityOrigin.h.
Somehow a code-reorg-gone-wrong left us with two copies of the
WebSecurityOrigin.h file, one in public/web and one in public/platform.
Since then the two files have diverged, but fortunately all the changes
were made to the correct copy in public/platform. This finished said
reorg by deleting the old no-longer-a-copy and updating all references
to refer to the new location.
Review URL: https://codereview.chromium.org/1671493003
Cr-Commit-Position: refs/heads/master@{#373662}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/renderer/script_context.cc | 2 | ||||
| -rw-r--r-- | extensions/renderer/script_injection.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc index 7987236..abf38d4 100644 --- a/extensions/renderer/script_context.cc +++ b/extensions/renderer/script_context.cc @@ -24,12 +24,12 @@ #include "extensions/renderer/renderer_extension_registry.h" #include "extensions/renderer/v8_helpers.h" #include "gin/per_context_data.h" +#include "third_party/WebKit/public/platform/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebDataSource.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" -#include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebView.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc index 2606169..70464b6 100644 --- a/extensions/renderer/script_injection.cc +++ b/extensions/renderer/script_injection.cc @@ -22,11 +22,11 @@ #include "extensions/renderer/extensions_renderer_client.h" #include "extensions/renderer/script_injection_callback.h" #include "extensions/renderer/scripts_run_info.h" +#include "third_party/WebKit/public/platform/WebSecurityOrigin.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebScriptSource.h" -#include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "url/gurl.h" namespace extensions { |