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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2655043005: MD Settings: Bluetooth: Move device list to subpage (Closed)
Patch Set: Fix clang, ES6 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
« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/test/BUILD.gn » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 {"bluetoothConnected", IDS_SETTINGS_BLUETOOTH_CONNECTED}, 324 {"bluetoothConnected", IDS_SETTINGS_BLUETOOTH_CONNECTED},
325 {"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING}, 325 {"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING},
326 {"bluetoothDisabled", IDS_SETTINGS_BLUETOOTH_DISABLED}, 326 {"bluetoothDisabled", IDS_SETTINGS_BLUETOOTH_DISABLED},
327 {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT}, 327 {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},
328 {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR}, 328 {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
329 {"bluetoothEnabled", IDS_SETTINGS_BLUETOOTH_ENABLED}, 329 {"bluetoothEnabled", IDS_SETTINGS_BLUETOOTH_ENABLED},
330 {"bluetoothExpandA11yLabel", 330 {"bluetoothExpandA11yLabel",
331 IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL}, 331 IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL},
332 {"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES}, 332 {"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES},
333 {"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED}, 333 {"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED},
334 {"bluetoothOff", IDS_SETTINGS_BLUETOOTH_OFF},
335 {"bluetoothOn", IDS_SETTINGS_BLUETOOTH_ON},
334 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH}, 336 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
335 {"bluetoothPair", IDS_SETTINGS_BLUETOOTH_PAIR}, 337 {"bluetoothPair", IDS_SETTINGS_BLUETOOTH_PAIR},
336 {"bluetoothPairDevice", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE}, 338 {"bluetoothPairDevice", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE},
337 {"bluetoothPairDevicePageTitle", 339 {"bluetoothPairDevicePageTitle",
338 IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE}, 340 IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE},
339 {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY}, 341 {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},
340 {"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE}, 342 {"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE},
341 {"bluetoothScanning", IDS_SETTINGS_BLUETOOTH_SCANNING}, 343 {"bluetoothScanning", IDS_SETTINGS_BLUETOOTH_SCANNING},
342 // Device connecting and pairing. 344 // Device connecting and pairing.
343 {"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING}, 345 {"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING},
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1867 1869
1868 #if defined(OS_CHROMEOS) 1870 #if defined(OS_CHROMEOS)
1869 chromeos::network_element::AddLocalizedStrings(html_source); 1871 chromeos::network_element::AddLocalizedStrings(html_source);
1870 #endif 1872 #endif
1871 policy_indicator::AddLocalizedStrings(html_source); 1873 policy_indicator::AddLocalizedStrings(html_source);
1872 1874
1873 html_source->SetJsonPath(kLocalizedStringsFile); 1875 html_source->SetJsonPath(kLocalizedStringsFile);
1874 } 1876 }
1875 1877
1876 } // namespace settings 1878 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698