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 /ipc/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 'ipc/mojo')
-rw-r--r-- | ipc/mojo/DEPS | 4 | ||||
-rw-r--r-- | ipc/mojo/async_handle_waiter.cc | 2 | ||||
-rw-r--r-- | ipc/mojo/async_handle_waiter.h | 2 | ||||
-rw-r--r-- | ipc/mojo/async_handle_waiter_unittest.cc | 2 | ||||
-rw-r--r-- | ipc/mojo/ipc_channel_mojo.cc | 4 | ||||
-rw-r--r-- | ipc/mojo/ipc_channel_mojo.h | 4 | ||||
-rw-r--r-- | ipc/mojo/ipc_message_pipe_reader.h | 4 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_bootstrap.cc | 2 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_bootstrap.h | 2 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_perftest.cc | 2 | ||||
-rw-r--r-- | ipc/mojo/run_all_unittests.cc | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/ipc/mojo/DEPS b/ipc/mojo/DEPS index 039e243..fb36693 100644 --- a/ipc/mojo/DEPS +++ b/ipc/mojo/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+mojo/public", - "+mojo/edk/embedder", + "+third_party/mojo/src/mojo/public", + "+third_party/mojo/src/mojo/edk/embedder", ] diff --git a/ipc/mojo/async_handle_waiter.cc b/ipc/mojo/async_handle_waiter.cc index f19d782..7b199ed 100644 --- a/ipc/mojo/async_handle_waiter.cc +++ b/ipc/mojo/async_handle_waiter.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/async_handle_waiter.h b/ipc/mojo/async_handle_waiter.h index 16d9c88..55acb3e 100644 --- a/ipc/mojo/async_handle_waiter.h +++ b/ipc/mojo/async_handle_waiter.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "ipc/ipc_export.h" -#include "mojo/public/c/system/types.h" +#include "third_party/mojo/src/mojo/public/c/system/types.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/async_handle_waiter_unittest.cc b/ipc/mojo/async_handle_waiter_unittest.cc index dd13d46..fbaf3ca 100644 --- a/ipc/mojo/async_handle_waiter_unittest.cc +++ b/ipc/mojo/async_handle_waiter_unittest.cc @@ -8,8 +8,8 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/threading/thread.h" -#include "mojo/public/cpp/system/message_pipe.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index 1f3e3c4..201fe57 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -13,8 +13,8 @@ #include "ipc/ipc_message_macros.h" #include "ipc/mojo/client_channel.mojom.h" #include "ipc/mojo/ipc_mojo_bootstrap.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/public/cpp/bindings/error_handler.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h" namespace IPC { diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h index 43dd0d0..5062577 100644 --- a/ipc/mojo/ipc_channel_mojo.h +++ b/ipc/mojo/ipc_channel_mojo.h @@ -15,8 +15,8 @@ #include "ipc/ipc_export.h" #include "ipc/mojo/ipc_message_pipe_reader.h" #include "ipc/mojo/ipc_mojo_bootstrap.h" -#include "mojo/edk/embedder/channel_info_forward.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace IPC { diff --git a/ipc/mojo/ipc_message_pipe_reader.h b/ipc/mojo/ipc_message_pipe_reader.h index 90efe6f..74de71b 100644 --- a/ipc/mojo/ipc_message_pipe_reader.h +++ b/ipc/mojo/ipc_message_pipe_reader.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ipc/ipc_message.h" -#include "mojo/public/c/environment/async_waiter.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/c/environment/async_waiter.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" namespace IPC { namespace internal { diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc index a95dae2..591ced0 100644 --- a/ipc/mojo/ipc_mojo_bootstrap.cc +++ b/ipc/mojo/ipc_mojo_bootstrap.cc @@ -8,7 +8,7 @@ #include "base/process/process_handle.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_platform_file.h" -#include "mojo/edk/embedder/platform_channel_pair.h" +#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" namespace IPC { diff --git a/ipc/mojo/ipc_mojo_bootstrap.h b/ipc/mojo/ipc_mojo_bootstrap.h index 7267553..eb1a987 100644 --- a/ipc/mojo/ipc_mojo_bootstrap.h +++ b/ipc/mojo/ipc_mojo_bootstrap.h @@ -9,7 +9,7 @@ #include "base/process/process_handle.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_listener.h" -#include "mojo/edk/embedder/scoped_platform_handle.h" +#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" namespace IPC { diff --git a/ipc/mojo/ipc_mojo_perftest.cc b/ipc/mojo/ipc_mojo_perftest.cc index 8bdac8c9..7147cd0 100644 --- a/ipc/mojo/ipc_mojo_perftest.cc +++ b/ipc/mojo/ipc_mojo_perftest.cc @@ -6,7 +6,7 @@ #include "ipc/ipc_perftest_support.h" #include "ipc/mojo/ipc_channel_mojo.h" #include "ipc/mojo/ipc_channel_mojo_host.h" -#include "mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" namespace { diff --git a/ipc/mojo/run_all_unittests.cc b/ipc/mojo/run_all_unittests.cc index cc5b102..fe2bf85 100644 --- a/ipc/mojo/run_all_unittests.cc +++ b/ipc/mojo/run_all_unittests.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" -#include "mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" #if defined(OS_ANDROID) #include "base/android/jni_android.h" |