chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc - Issue 2448713002: bluetooth: Add Device connection logic and accompanying user interface.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2448713002: bluetooth: Add Device connection logic and accompanying user interface. (Closed)

Patch Set: Remove GetConnectionError Created 4 years, 1 month 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/device_table.js ('k') | device/BUILD.gn » ('j') | device/bluetooth/adapter.cc » ('J')

OLD	NEW
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 17 matching lines...) Expand all Loading...
28 IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS);	28 IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS);

29 html_source->AddResourcePath("interfaces.js",	29 html_source->AddResourcePath("interfaces.js",

30 IDR_BLUETOOTH_INTERNALS_INTERFACES_JS);	30 IDR_BLUETOOTH_INTERNALS_INTERFACES_JS);

31	31

32 html_source->AddResourcePath(	32 html_source->AddResourcePath(

33 "device/bluetooth/public/interfaces/adapter.mojom",	33 "device/bluetooth/public/interfaces/adapter.mojom",

34 IDR_BLUETOOTH_ADAPTER_MOJO_JS);	34 IDR_BLUETOOTH_ADAPTER_MOJO_JS);

35 html_source->AddResourcePath(	35 html_source->AddResourcePath(

36 "device/bluetooth/public/interfaces/device.mojom",	36 "device/bluetooth/public/interfaces/device.mojom",

37 IDR_BLUETOOTH_DEVICE_MOJO_JS);	37 IDR_BLUETOOTH_DEVICE_MOJO_JS);

	38 html_source->AddResourcePath("device/bluetooth/public/interfaces/uuid.mojom",

	39 IDR_BLUETOOTH_UUID_MOJO_JS);

38 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML);	40 html_source->SetDefaultResource(IDR_BLUETOOTH_INTERNALS_HTML);

39 html_source->DisableI18nAndUseGzipForAllPaths();	41 html_source->DisableI18nAndUseGzipForAllPaths();

40	42

41 Profile* profile = Profile::FromWebUI(web_ui);	43 Profile* profile = Profile::FromWebUI(web_ui);

42 content::WebUIDataSource::Add(profile, html_source);	44 content::WebUIDataSource::Add(profile, html_source);

43 }	45 }

44	46

45 BluetoothInternalsUI::~BluetoothInternalsUI() {}	47 BluetoothInternalsUI::~BluetoothInternalsUI() {}

OLD	NEW