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

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

Issue 2627243002: bluetooth: Add control for reading/writing of characteristics to internals page. (Closed)
Patch Set: Merge upstream, add comment detail for type converter Created 3 years, 10 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 html_source->AddResourcePath("interfaces.js", 43 html_source->AddResourcePath("interfaces.js",
44 IDR_BLUETOOTH_INTERNALS_INTERFACES_JS); 44 IDR_BLUETOOTH_INTERNALS_INTERFACES_JS);
45 html_source->AddResourcePath("object_fieldset.js", 45 html_source->AddResourcePath("object_fieldset.js",
46 IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS); 46 IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS);
47 html_source->AddResourcePath("service_list.js", 47 html_source->AddResourcePath("service_list.js",
48 IDR_BLUETOOTH_INTERNALS_SERVICE_LIST_JS); 48 IDR_BLUETOOTH_INTERNALS_SERVICE_LIST_JS);
49 html_source->AddResourcePath("sidebar.js", 49 html_source->AddResourcePath("sidebar.js",
50 IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS); 50 IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS);
51 html_source->AddResourcePath("snackbar.js", 51 html_source->AddResourcePath("snackbar.js",
52 IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS); 52 IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS);
53 html_source->AddResourcePath("value_control.js",
54 IDR_BLUETOOTH_INTERNALS_VALUE_CONTROL_JS);
53 55
54 html_source->AddResourcePath( 56 html_source->AddResourcePath(
55 "device/bluetooth/public/interfaces/adapter.mojom", 57 "device/bluetooth/public/interfaces/adapter.mojom",
56 IDR_BLUETOOTH_ADAPTER_MOJO_JS); 58 IDR_BLUETOOTH_ADAPTER_MOJO_JS);
57 html_source->AddResourcePath( 59 html_source->AddResourcePath(
58 "device/bluetooth/public/interfaces/device.mojom", 60 "device/bluetooth/public/interfaces/device.mojom",
59 IDR_BLUETOOTH_DEVICE_MOJO_JS); 61 IDR_BLUETOOTH_DEVICE_MOJO_JS);
60 html_source->AddResourcePath("device/bluetooth/public/interfaces/uuid.mojom", 62 html_source->AddResourcePath("device/bluetooth/public/interfaces/uuid.mojom",
61 IDR_BLUETOOTH_UUID_MOJO_JS); 63 IDR_BLUETOOTH_UUID_MOJO_JS);
62 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML); 64 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML);
63 html_source->UseGzip(std::unordered_set<std::string>()); 65 html_source->UseGzip(std::unordered_set<std::string>());
64 66
65 Profile* profile = Profile::FromWebUI(web_ui); 67 Profile* profile = Profile::FromWebUI(web_ui);
66 content::WebUIDataSource::Add(profile, html_source); 68 content::WebUIDataSource::Add(profile, html_source);
67 } 69 }
68 70
69 BluetoothInternalsUI::~BluetoothInternalsUI() {} 71 BluetoothInternalsUI::~BluetoothInternalsUI() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698