[mojo] include mojo header in /chrome/browser/usb
This is preparation CL to use forward declaration only header in mojo's
generated code.
If we include forward declaration only header in mojo's generated code, we need
to include mojo header files in some places where definition is necessary.
master CL is in
https://chromium-review.googlesource.com/c/chromium/src/+/1438975
This CL was uploaded by git cl split.
R=rockot@google.com
CC: rockot@google.com
Bug: 922875
Change-Id: I0aed8bd02ebc8d31833aeaefac19e2bc71ee5131
Reviewed-on: https://chromium-review.googlesource.com/c/1447078
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#627665}diff --git a/chrome/browser/usb/usb_chooser_context.h b/chrome/browser/usb/usb_chooser_context.h
index ffe6b11b..aed3fa3 100644
--- a/chrome/browser/usb/usb_chooser_context.h
+++ b/chrome/browser/usb/usb_chooser_context.h
@@ -19,6 +19,7 @@
#include "chrome/browser/permissions/chooser_context_base.h"
#include "chrome/browser/usb/usb_policy_allowed_devices.h"
#include "device/usb/public/mojom/device_manager.mojom.h"
+#include "device/usb/public/mojom/device_manager_client.mojom.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
class UsbChooserContext : public ChooserContextBase,
diff --git a/chrome/browser/usb/usb_chooser_context_mock_device_observer.cc b/chrome/browser/usb/usb_chooser_context_mock_device_observer.cc
index 6672d46..5c63ab3 100644
--- a/chrome/browser/usb/usb_chooser_context_mock_device_observer.cc
+++ b/chrome/browser/usb/usb_chooser_context_mock_device_observer.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/usb/usb_chooser_context_mock_device_observer.h"
+#include "device/usb/public/mojom/device.mojom.h"
+
MockDeviceObserver::MockDeviceObserver() {}
MockDeviceObserver::~MockDeviceObserver() {}
diff --git a/chrome/browser/usb/usb_chooser_controller.cc b/chrome/browser/usb/usb_chooser_controller.cc
index 9e6b132..2fffee4 100644
--- a/chrome/browser/usb/usb_chooser_controller.cc
+++ b/chrome/browser/usb/usb_chooser_controller.cc
@@ -20,6 +20,7 @@
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "device/usb/public/cpp/usb_utils.h"
+#include "device/usb/public/mojom/device_enumeration_options.mojom.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
diff --git a/chrome/browser/usb/usb_chooser_controller_unittest.cc b/chrome/browser/usb/usb_chooser_controller_unittest.cc
index e02ce0b9..dfa6dc1 100644
--- a/chrome/browser/usb/usb_chooser_controller_unittest.cc
+++ b/chrome/browser/usb/usb_chooser_controller_unittest.cc
@@ -18,6 +18,7 @@
#include "content/public/test/web_contents_tester.h"
#include "device/usb/public/cpp/fake_usb_device_manager.h"
#include "device/usb/public/mojom/device.mojom.h"
+#include "device/usb/public/mojom/device_enumeration_options.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/chrome/browser/usb/usb_policy_allowed_devices.cc b/chrome/browser/usb/usb_policy_allowed_devices.cc
index 1867f15..397ee1f 100644
--- a/chrome/browser/usb/usb_policy_allowed_devices.cc
+++ b/chrome/browser/usb/usb_policy_allowed_devices.cc
@@ -12,6 +12,7 @@
#include "base/values.h"
#include "components/content_settings/core/common/pref_names.h"
#include "components/prefs/pref_service.h"
+#include "device/usb/public/mojom/device.mojom.h"
#include "device/usb/public/mojom/device_manager.mojom.h"
namespace {
diff --git a/chrome/browser/usb/web_usb_chooser.cc b/chrome/browser/usb/web_usb_chooser.cc
index a636f534..09d01f4 100644
--- a/chrome/browser/usb/web_usb_chooser.cc
+++ b/chrome/browser/usb/web_usb_chooser.cc
@@ -13,6 +13,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
+#include "device/usb/public/mojom/device_enumeration_options.mojom.h"
WebUsbChooser::WebUsbChooser(content::RenderFrameHost* render_frame_host)
: render_frame_host_(render_frame_host) {
diff --git a/chrome/browser/usb/web_usb_detector.h b/chrome/browser/usb/web_usb_detector.h
index 96ad098..b53a780 100644
--- a/chrome/browser/usb/web_usb_detector.h
+++ b/chrome/browser/usb/web_usb_detector.h
@@ -9,7 +9,9 @@
#include "base/macros.h"
#include "device/usb/public/mojom/device_manager.mojom.h"
+#include "device/usb/public/mojom/device_manager_client.mojom.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
+#include "url/gurl.h"
class WebUsbDetector : public device::mojom::UsbDeviceManagerClient {
public:
diff --git a/chrome/browser/usb/web_usb_service_impl.cc b/chrome/browser/usb/web_usb_service_impl.cc
index 268f397db..586a6c6 100644
--- a/chrome/browser/usb/web_usb_service_impl.cc
+++ b/chrome/browser/usb/web_usb_service_impl.cc
@@ -14,6 +14,8 @@
#include "chrome/browser/usb/usb_chooser_context_factory.h"
#include "chrome/browser/usb/usb_tab_helper.h"
#include "content/public/browser/browser_thread.h"
+#include "device/usb/public/mojom/device_enumeration_options.mojom.h"
+#include "media/mojo/interfaces/remoting_common.mojom.h"
WebUsbServiceImpl::WebUsbServiceImpl(
content::RenderFrameHost* render_frame_host,
