diff options
| author | markdittmer <markdittmer@chromium.org> | 2016-03-02 14:41:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 22:43:55 +0000 |
| commit | 45eb2e749a8b08988ab45bfd6806c004e9f511fa (patch) | |
| tree | 0aecb6b3231864a85e6687f03aa5a534ba76f0cf /extensions | |
| parent | c80d2b59c2357c6cae1dee9baef6fbaecb3c8136 (diff) | |
| download | chromium_src-45eb2e749a8b08988ab45bfd6806c004e9f511fa.zip chromium_src-45eb2e749a8b08988ab45bfd6806c004e9f511fa.tar.gz chromium_src-45eb2e749a8b08988ab45bfd6806c004e9f511fa.tar.bz2 | |
Move GURL ParamTraits to url/ipc
As a part of the GPU refactor for Mus, we are trying to eliminate spots where content/common/gpu depends on
content/. One such dependency is GURL. As per discussion here:
https://codereview.chromium.org/1703163002/, the plan of record is to move
GURL ParamTraits out of content/ and into url/.
BUG=586368
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1722773002
Cr-Commit-Position: refs/heads/master@{#378859}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/common/extension_utility_messages.h | 1 | ||||
| -rw-r--r-- | extensions/extensions.gyp | 5 | ||||
| -rw-r--r-- | extensions/utility/unpacker.cc | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/extensions/common/extension_utility_messages.h b/extensions/common/extension_utility_messages.h index cfaf273..24df23f 100644 --- a/extensions/common/extension_utility_messages.h +++ b/extensions/common/extension_utility_messages.h @@ -10,6 +10,7 @@ #include "ipc/ipc_message_macros.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/ipc/gfx_param_traits.h" +#include "url/ipc/url_param_traits.h" #define IPC_MESSAGE_START ExtensionUtilityMsgStart diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 82e7d6a..855f50b 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -68,6 +68,7 @@ '../url/url.gyp:url_lib', '../third_party/boringssl/boringssl.gyp:boringssl', '../third_party/libxml/libxml.gyp:libxml', + '../url/ipc/url_ipc.gyp:url_ipc', 'common/api/api.gyp:extensions_api', 'extensions_resources.gyp:extensions_resources', 'extensions_strings.gyp:extensions_strings', @@ -199,9 +200,13 @@ # GN version: //extensions/renderer 'target_name': 'extensions_renderer', 'type': 'static_library', + + 'defines': [ 'URL_PARAM_TRAITS_FIX' ], + 'dependencies': [ 'extensions_resources.gyp:extensions_resources', '../components/components.gyp:guest_view_renderer', + '../content/content.gyp:content_common', '../content/content.gyp:content_resources', '../gin/gin.gyp:gin', '../mojo/mojo_public.gyp:mojo_js_bindings', diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc index be0a4b5..083cb72 100644 --- a/extensions/utility/unpacker.cc +++ b/extensions/utility/unpacker.cc @@ -20,7 +20,6 @@ #include "base/threading/thread.h" #include "base/values.h" #include "content/public/child/image_decoder_utils.h" -#include "content/public/common/common_param_traits.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_l10n_util.h" |