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

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

Issue 2617923002: bluetooth: Add service list to DeviceDetailsPage in internals page. (Closed)
Patch Set: Add semicolon, inline serviceViewObj 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
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"
(...skipping 14 matching lines...) Expand all
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("device_collection.js", 27 html_source->AddResourcePath("device_collection.js",
28 IDR_BLUETOOTH_INTERNALS_DEVICE_COLLECTION_JS); 28 IDR_BLUETOOTH_INTERNALS_DEVICE_COLLECTION_JS);
29 html_source->AddResourcePath("device_details_page.js", 29 html_source->AddResourcePath("device_details_page.js",
30 IDR_BLUETOOTH_INTERNALS_DEVICE_DETAILS_PAGE_JS); 30 IDR_BLUETOOTH_INTERNALS_DEVICE_DETAILS_PAGE_JS);
31 html_source->AddResourcePath("device_table.js", 31 html_source->AddResourcePath("device_table.js",
32 IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS); 32 IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS);
33 html_source->AddResourcePath("devices_page.js", 33 html_source->AddResourcePath("devices_page.js",
34 IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS); 34 IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS);
35 html_source->AddResourcePath("expandable_list.js",
36 IDR_BLUETOOTH_INTERNALS_EXPANDABLE_LIST_JS);
35 html_source->AddResourcePath("interfaces.js", 37 html_source->AddResourcePath("interfaces.js",
36 IDR_BLUETOOTH_INTERNALS_INTERFACES_JS); 38 IDR_BLUETOOTH_INTERNALS_INTERFACES_JS);
37 html_source->AddResourcePath("object_fieldset.js", 39 html_source->AddResourcePath("object_fieldset.js",
38 IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS); 40 IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS);
41 html_source->AddResourcePath("service_list.js",
42 IDR_BLUETOOTH_INTERNALS_SERVICE_LIST_JS);
39 html_source->AddResourcePath("sidebar.js", 43 html_source->AddResourcePath("sidebar.js",
40 IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS); 44 IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS);
41 html_source->AddResourcePath("snackbar.js", 45 html_source->AddResourcePath("snackbar.js",
42 IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS); 46 IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS);
43 47
44 html_source->AddResourcePath( 48 html_source->AddResourcePath(
45 "device/bluetooth/public/interfaces/adapter.mojom", 49 "device/bluetooth/public/interfaces/adapter.mojom",
46 IDR_BLUETOOTH_ADAPTER_MOJO_JS); 50 IDR_BLUETOOTH_ADAPTER_MOJO_JS);
47 html_source->AddResourcePath( 51 html_source->AddResourcePath(
48 "device/bluetooth/public/interfaces/device.mojom", 52 "device/bluetooth/public/interfaces/device.mojom",
49 IDR_BLUETOOTH_DEVICE_MOJO_JS); 53 IDR_BLUETOOTH_DEVICE_MOJO_JS);
50 html_source->AddResourcePath("device/bluetooth/public/interfaces/uuid.mojom", 54 html_source->AddResourcePath("device/bluetooth/public/interfaces/uuid.mojom",
51 IDR_BLUETOOTH_UUID_MOJO_JS); 55 IDR_BLUETOOTH_UUID_MOJO_JS);
52 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML); 56 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML);
53 html_source->UseGzip(std::unordered_set<std::string>()); 57 html_source->UseGzip(std::unordered_set<std::string>());
54 58
55 Profile* profile = Profile::FromWebUI(web_ui); 59 Profile* profile = Profile::FromWebUI(web_ui);
56 content::WebUIDataSource::Add(profile, html_source); 60 content::WebUIDataSource::Add(profile, html_source);
57 } 61 }
58 62
59 BluetoothInternalsUI::~BluetoothInternalsUI() {} 63 BluetoothInternalsUI::~BluetoothInternalsUI() {}
OLDNEW
« no previous file with comments | « chrome/browser/resources/bluetooth_internals/service_list.js ('k') | device/bluetooth/device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698