chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2676103002: MD Settings: Move bluetooth UI from dialog to subpage

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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2676103002: MD Settings: Move bluetooth UI from dialog to subpage (Closed)

Patch Set: Feedback 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp ('k') | chrome/test/data/webui/settings/bluetooth_page_tests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

index 80d456ba9cd2caceea5d58abe94d2de8ae5718e9..d429ad0fdee2366a0d47111b70961215dbe6a5a9 100644

--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -323,6 +323,9 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {

{"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},

{"bluetoothConnected", IDS_SETTINGS_BLUETOOTH_CONNECTED},

{"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING},

+ {"bluetoothDeviceListPaired", IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED},

+ {"bluetoothDeviceListUnpaired",

+ IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED},

{"bluetoothDisabled", IDS_SETTINGS_BLUETOOTH_DISABLED},

{"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},

{"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},

@@ -330,17 +333,16 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {

{"bluetoothExpandA11yLabel",

IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL},

{"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES},

+ {"bluetoothNoDevicesFound", IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND},

{"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED},

{"bluetoothOff", IDS_SETTINGS_BLUETOOTH_OFF},

{"bluetoothOn", IDS_SETTINGS_BLUETOOTH_ON},

{"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},

{"bluetoothPair", IDS_SETTINGS_BLUETOOTH_PAIR},

- {"bluetoothPairDevice", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE},

{"bluetoothPairDevicePageTitle",

IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE},

{"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},

{"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE},

- {"bluetoothScanning", IDS_SETTINGS_BLUETOOTH_SCANNING},

// Device connecting and pairing.

{"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING},

{"bluetoothEnterKey", IDS_OPTIONS_SETTINGS_BLUETOOTH_ENTER_KEY},