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

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

Issue 2799163003: MD Settings: Bluetooth: Hide subpage arrow when disabled and fix string (Closed)
Patch Set: Fix connect string Created 3 years, 8 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/bluetooth_page/bluetooth_page.html ('k') | no next file » | 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 354
355 #if defined(OS_CHROMEOS) 355 #if defined(OS_CHROMEOS)
356 void AddBluetoothStrings(content::WebUIDataSource* html_source) { 356 void AddBluetoothStrings(content::WebUIDataSource* html_source) {
357 LocalizedString localized_strings[] = { 357 LocalizedString localized_strings[] = {
358 {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY}, 358 {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},
359 {"bluetoothConnected", IDS_SETTINGS_BLUETOOTH_CONNECTED}, 359 {"bluetoothConnected", IDS_SETTINGS_BLUETOOTH_CONNECTED},
360 {"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING}, 360 {"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING},
361 {"bluetoothDeviceListPaired", IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED}, 361 {"bluetoothDeviceListPaired", IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED},
362 {"bluetoothDeviceListUnpaired", 362 {"bluetoothDeviceListUnpaired",
363 IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED}, 363 IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED},
364 {"bluetoothConnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT},
364 {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT}, 365 {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},
365 {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR}, 366 {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
366 {"bluetoothToggleA11yLabel", 367 {"bluetoothToggleA11yLabel",
367 IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL}, 368 IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL},
368 {"bluetoothExpandA11yLabel", 369 {"bluetoothExpandA11yLabel",
369 IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL}, 370 IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL},
370 {"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES}, 371 {"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES},
371 {"bluetoothNoDevicesFound", IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND}, 372 {"bluetoothNoDevicesFound", IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND},
372 {"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED}, 373 {"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED},
373 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH}, 374 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
(...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after
2032 2033
2033 #if defined(OS_CHROMEOS) 2034 #if defined(OS_CHROMEOS)
2034 chromeos::network_element::AddLocalizedStrings(html_source); 2035 chromeos::network_element::AddLocalizedStrings(html_source);
2035 #endif 2036 #endif
2036 policy_indicator::AddLocalizedStrings(html_source); 2037 policy_indicator::AddLocalizedStrings(html_source);
2037 2038
2038 html_source->SetJsonPath(kLocalizedStringsFile); 2039 html_source->SetJsonPath(kLocalizedStringsFile);
2039 } 2040 }
2040 2041
2041 } // namespace settings 2042 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698