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 /ui/keyboard | |
| 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 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/webui/DEPS | 2 | ||||
| -rw-r--r-- | ui/keyboard/webui/vk_mojo_handler.h | 2 | ||||
| -rw-r--r-- | ui/keyboard/webui/vk_webui_controller.cc | 4 | ||||
| -rw-r--r-- | ui/keyboard/webui/vk_webui_controller.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ui/keyboard/webui/DEPS b/ui/keyboard/webui/DEPS index ef8ad28..5f8633a 100644 --- a/ui/keyboard/webui/DEPS +++ b/ui/keyboard/webui/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+mojo/public", + "+third_party/mojo/src/mojo/public", ] diff --git a/ui/keyboard/webui/vk_mojo_handler.h b/ui/keyboard/webui/vk_mojo_handler.h index 8d69d15..750120d 100644 --- a/ui/keyboard/webui/vk_mojo_handler.h +++ b/ui/keyboard/webui/vk_mojo_handler.h @@ -6,7 +6,7 @@ #define UI_KEYBOARD_WEBUI_VK_MOJO_HANDLER_H_ #include "base/macros.h" -#include "mojo/public/cpp/bindings/binding.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "ui/base/ime/input_method_observer.h" #include "ui/keyboard/webui/keyboard.mojom.h" diff --git a/ui/keyboard/webui/vk_webui_controller.cc b/ui/keyboard/webui/vk_webui_controller.cc index 5fd04ce..9a4688d 100644 --- a/ui/keyboard/webui/vk_webui_controller.cc +++ b/ui/keyboard/webui/vk_webui_controller.cc @@ -13,8 +13,8 @@ #include "content/public/common/service_registry.h" #include "grit/keyboard_resources.h" #include "grit/keyboard_resources_map.h" -#include "mojo/public/cpp/bindings/interface_impl.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #include "ui/keyboard/keyboard_constants.h" #include "ui/keyboard/keyboard_util.h" #include "ui/keyboard/webui/vk_mojo_handler.h" diff --git a/ui/keyboard/webui/vk_webui_controller.h b/ui/keyboard/webui/vk_webui_controller.h index 30d1e25..e1b1876 100644 --- a/ui/keyboard/webui/vk_webui_controller.h +++ b/ui/keyboard/webui/vk_webui_controller.h @@ -10,8 +10,8 @@ #include "base/memory/weak_ptr.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_controller_factory.h" -#include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/cpp/system/core.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/cpp/system/core.h" #include "ui/keyboard/keyboard_export.h" #include "ui/keyboard/webui/keyboard.mojom.h" |