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

Side by Side Diff: chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc

Issue 2640073004: bluetooth: Add descriptor list to DeviceDetailsPage on internals page. (Closed)
Patch Set: Fix merge issue of bluetooth_internals.css Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/bluetooth_internals/service_list.js ('k') | device/bluetooth/device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" 5 #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/common/url_constants.h" 8 #include "chrome/common/url_constants.h"
9 #include "chrome/grit/browser_resources.h" 9 #include "chrome/grit/browser_resources.h"
10 #include "content/public/browser/web_ui_data_source.h" 10 #include "content/public/browser/web_ui_data_source.h"
11 11
12 BluetoothInternalsUI::BluetoothInternalsUI(content::WebUI* web_ui) 12 BluetoothInternalsUI::BluetoothInternalsUI(content::WebUI* web_ui)
13 : content::WebUIController(web_ui) { 13 : content::WebUIController(web_ui) {
14 // Set up the chrome://bluetooth-internals source. 14 // Set up the chrome://bluetooth-internals source.
15 content::WebUIDataSource* html_source = 15 content::WebUIDataSource* html_source =
16 content::WebUIDataSource::Create(chrome::kChromeUIBluetoothInternalsHost); 16 content::WebUIDataSource::Create(chrome::kChromeUIBluetoothInternalsHost);
17 17
18 // Add required resources. 18 // Add required resources.
19 html_source->AddResourcePath("adapter_broker.js", 19 html_source->AddResourcePath("adapter_broker.js",
20 IDR_BLUETOOTH_INTERNALS_ADAPTER_BROKER_JS); 20 IDR_BLUETOOTH_INTERNALS_ADAPTER_BROKER_JS);
21 html_source->AddResourcePath("adapter_page.js", 21 html_source->AddResourcePath("adapter_page.js",
22 IDR_BLUETOOTH_INTERNALS_ADAPTER_PAGE_JS); 22 IDR_BLUETOOTH_INTERNALS_ADAPTER_PAGE_JS);
23 html_source->AddResourcePath("bluetooth_internals.css", 23 html_source->AddResourcePath("bluetooth_internals.css",
24 IDR_BLUETOOTH_INTERNALS_CSS); 24 IDR_BLUETOOTH_INTERNALS_CSS);
25 html_source->AddResourcePath("bluetooth_internals.js", 25 html_source->AddResourcePath("bluetooth_internals.js",
26 IDR_BLUETOOTH_INTERNALS_JS); 26 IDR_BLUETOOTH_INTERNALS_JS);
27 html_source->AddResourcePath("characteristic_list.js", 27 html_source->AddResourcePath("characteristic_list.js",
28 IDR_BLUETOOTH_INTERNALS_CHARACTERISTIC_LIST_JS); 28 IDR_BLUETOOTH_INTERNALS_CHARACTERISTIC_LIST_JS);
29 html_source->AddResourcePath("descriptor_list.js",
30 IDR_BLUETOOTH_INTERNALS_DESCRIPTOR_LIST_JS);
29 html_source->AddResourcePath("device_broker.js", 31 html_source->AddResourcePath("device_broker.js",
30 IDR_BLUETOOTH_INTERNALS_DEVICE_BROKER_JS); 32 IDR_BLUETOOTH_INTERNALS_DEVICE_BROKER_JS);
31 html_source->AddResourcePath("device_collection.js", 33 html_source->AddResourcePath("device_collection.js",
32 IDR_BLUETOOTH_INTERNALS_DEVICE_COLLECTION_JS); 34 IDR_BLUETOOTH_INTERNALS_DEVICE_COLLECTION_JS);
33 html_source->AddResourcePath("device_details_page.js", 35 html_source->AddResourcePath("device_details_page.js",
34 IDR_BLUETOOTH_INTERNALS_DEVICE_DETAILS_PAGE_JS); 36 IDR_BLUETOOTH_INTERNALS_DEVICE_DETAILS_PAGE_JS);
35 html_source->AddResourcePath("device_table.js", 37 html_source->AddResourcePath("device_table.js",
36 IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS); 38 IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS);
37 html_source->AddResourcePath("devices_page.js", 39 html_source->AddResourcePath("devices_page.js",
38 IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS); 40 IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS);
(...skipping 19 matching lines...) Expand all
58 html_source->AddResourcePath("device/bluetooth/public/interfaces/uuid.mojom", 60 html_source->AddResourcePath("device/bluetooth/public/interfaces/uuid.mojom",
59 IDR_BLUETOOTH_UUID_MOJO_JS); 61 IDR_BLUETOOTH_UUID_MOJO_JS);
60 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML); 62 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML);
61 html_source->UseGzip(std::unordered_set<std::string>()); 63 html_source->UseGzip(std::unordered_set<std::string>());
62 64
63 Profile* profile = Profile::FromWebUI(web_ui); 65 Profile* profile = Profile::FromWebUI(web_ui);
64 content::WebUIDataSource::Add(profile, html_source); 66 content::WebUIDataSource::Add(profile, html_source);
65 } 67 }
66 68
67 BluetoothInternalsUI::~BluetoothInternalsUI() {} 69 BluetoothInternalsUI::~BluetoothInternalsUI() {}
OLDNEW
« no previous file with comments | « chrome/browser/resources/bluetooth_internals/service_list.js ('k') | device/bluetooth/device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698