diff options
author | blundell <blundell@chromium.org> | 2015-01-23 08:27:14 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-23 16:27:55 +0000 |
commit | 471b74f430d7885283a7257de6923fdc86a94368 (patch) | |
tree | e7041dc8b12840c74c7c09b259e6ea8a2975eddb /content/browser/mojo | |
parent | 630ce7c1985119bd70753f72fc27daebd4b85635 (diff) | |
download | chromium_src-471b74f430d7885283a7257de6923fdc86a94368.zip chromium_src-471b74f430d7885283a7257de6923fdc86a94368.tar.gz chromium_src-471b74f430d7885283a7257de6923fdc86a94368.tar.bz2 |
Include Mojo SDK/EDK via fully-qualified paths in Chromium code.
As a followup to the move of the Mojo SDK and EDK to live under //third_party,
this CL updates Chromium code to include SDK/EDK headers via fully-qualified
paths instead of relying on include_dirs that are exported by the Mojo targets.
This CL also includes mechanical updates to DEPS files to satisfy checkdeps.
Review URL: https://codereview.chromium.org/846443006
Cr-Commit-Position: refs/heads/master@{#312858}
Diffstat (limited to 'content/browser/mojo')
-rw-r--r-- | content/browser/mojo/mojo_application_host.cc | 2 | ||||
-rw-r--r-- | content/browser/mojo/mojo_application_host.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc index 1821967..e5a9b0b 100644 --- a/content/browser/mojo/mojo_application_host.cc +++ b/content/browser/mojo/mojo_application_host.cc @@ -7,7 +7,7 @@ #include "content/common/mojo/mojo_messages.h" #include "content/public/browser/browser_thread.h" #include "ipc/ipc_sender.h" -#include "mojo/edk/embedder/platform_channel_pair.h" +#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" namespace content { namespace { diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h index 0c02c49..53e150a 100644 --- a/content/browser/mojo/mojo_application_host.h +++ b/content/browser/mojo/mojo_application_host.h @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "base/process/process_handle.h" #include "content/common/mojo/service_registry_impl.h" -#include "mojo/edk/embedder/channel_init.h" -#include "mojo/edk/embedder/scoped_platform_handle.h" +#include "third_party/mojo/src/mojo/edk/embedder/channel_init.h" +#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #if defined(OS_ANDROID) #include "content/browser/mojo/service_registry_android.h" |