Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1734)

Unified Diff: chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc

Issue 2357383002: bluetooth: Add device list retrieval for chrome://bluetooth-internals (Closed)
Patch Set: Revert chrome browser client file Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
index e8a4f532da08dc72ce183d14171acde0925906fe..93def670f8d75c30907a7e9703ae627ea039cfeb 100644
--- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
+++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h"
+#include <utility>
ortuno 2016/09/28 09:44:55 same here?
mbrunson 2016/09/28 21:20:35 Done.
+
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/browser_resources.h"
@@ -20,6 +22,9 @@ BluetoothInternalsUI::BluetoothInternalsUI(content::WebUI* web_ui)
IDR_BLUETOOTH_INTERNALS_CSS);
html_source->AddResourcePath("bluetooth_internals.js",
IDR_BLUETOOTH_INTERNALS_JS);
+ html_source->AddResourcePath(
+ "device/bluetooth/public/interfaces/adapter.mojom",
+ IDR_BLUETOOTH_MOJO_JS);
html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML);
Profile* profile = Profile::FromWebUI(web_ui);

Powered by Google App Engine
This is Rietveld 408576698