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 | |
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')
7 files changed, 11 insertions, 11 deletions
diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc index 8bf1ca4..541d769 100644 --- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc +++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc @@ -16,7 +16,7 @@ #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_content_browser_client.h" #include "device/battery/battery_monitor.mojom.h" -#include "mojo/public/cpp/bindings/strong_binding.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" // These tests run against a dummy implementation of the BatteryMonitor service. // That is, they verify that the service implementation is correctly exposed to 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" diff --git a/content/browser/permissions/permission_service_context.h b/content/browser/permissions/permission_service_context.h index 1e71958..c14b40c 100644 --- a/content/browser/permissions/permission_service_context.h +++ b/content/browser/permissions/permission_service_context.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" #include "content/public/browser/web_contents_observer.h" -#include "mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace content { diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 690ccef..ac87d9c 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h @@ -20,7 +20,7 @@ #include "content/public/browser/render_process_host.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_platform_file.h" -#include "mojo/public/cpp/bindings/interface_ptr.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gl/gpu_switching_observer.h" diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index bbe54f6..8d8f465 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc @@ -11,7 +11,7 @@ #include "base/strings/string_util.h" #include "content/grit/content_resources.h" #include "content/public/common/content_client.h" -#include "mojo/public/js/constants.h" +#include "third_party/mojo/src/mojo/public/js/constants.h" #include "ui/base/webui/jstemplate_builder.h" #include "ui/base/webui/web_ui_util.h" diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index 274d4c1..847e39e 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc @@ -25,10 +25,10 @@ #include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" -#include "mojo/edk/test/test_utils.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/js/constants.h" +#include "third_party/mojo/src/mojo/edk/test/test_utils.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/js/constants.h" namespace content { namespace { |