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

Side by Side 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 unified diff | Download patch
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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 316
317 html_source->AddBoolean("isSupervised", profile->IsSupervised()); 317 html_source->AddBoolean("isSupervised", profile->IsSupervised());
318 } 318 }
319 319
320 #if defined(OS_CHROMEOS) 320 #if defined(OS_CHROMEOS)
321 void AddBluetoothStrings(content::WebUIDataSource* html_source) { 321 void AddBluetoothStrings(content::WebUIDataSource* html_source) {
322 LocalizedString localized_strings[] = { 322 LocalizedString localized_strings[] = {
323 {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY}, 323 {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},
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 {"bluetoothDeviceListPaired", IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED},
327 {"bluetoothDeviceListUnpaired",
328 IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED},
326 {"bluetoothDisabled", IDS_SETTINGS_BLUETOOTH_DISABLED}, 329 {"bluetoothDisabled", IDS_SETTINGS_BLUETOOTH_DISABLED},
327 {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT}, 330 {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},
328 {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR}, 331 {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
329 {"bluetoothEnabled", IDS_SETTINGS_BLUETOOTH_ENABLED}, 332 {"bluetoothEnabled", IDS_SETTINGS_BLUETOOTH_ENABLED},
330 {"bluetoothExpandA11yLabel", 333 {"bluetoothExpandA11yLabel",
331 IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL}, 334 IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL},
332 {"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES}, 335 {"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES},
336 {"bluetoothNoDevicesFound", IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND},
333 {"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED}, 337 {"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED},
334 {"bluetoothOff", IDS_SETTINGS_BLUETOOTH_OFF}, 338 {"bluetoothOff", IDS_SETTINGS_BLUETOOTH_OFF},
335 {"bluetoothOn", IDS_SETTINGS_BLUETOOTH_ON}, 339 {"bluetoothOn", IDS_SETTINGS_BLUETOOTH_ON},
336 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH}, 340 {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
337 {"bluetoothPair", IDS_SETTINGS_BLUETOOTH_PAIR}, 341 {"bluetoothPair", IDS_SETTINGS_BLUETOOTH_PAIR},
338 {"bluetoothPairDevice", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE},
339 {"bluetoothPairDevicePageTitle", 342 {"bluetoothPairDevicePageTitle",
340 IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE}, 343 IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE},
341 {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY}, 344 {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},
342 {"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE}, 345 {"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE},
343 {"bluetoothScanning", IDS_SETTINGS_BLUETOOTH_SCANNING},
344 // Device connecting and pairing. 346 // Device connecting and pairing.
345 {"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING}, 347 {"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING},
346 {"bluetoothEnterKey", IDS_OPTIONS_SETTINGS_BLUETOOTH_ENTER_KEY}, 348 {"bluetoothEnterKey", IDS_OPTIONS_SETTINGS_BLUETOOTH_ENTER_KEY},
347 // These ids are generated in JS using 'bluetooth_' + a value from 349 // These ids are generated in JS using 'bluetooth_' + a value from
348 // bluetoothPrivate.PairingEventType (see bluetooth_private.idl). 350 // bluetoothPrivate.PairingEventType (see bluetooth_private.idl).
349 // 'keysEntered', and 'requestAuthorization' have no associated message. 351 // 'keysEntered', and 'requestAuthorization' have no associated message.
350 {"bluetooth_requestPincode", IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE}, 352 {"bluetooth_requestPincode", IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE},
351 {"bluetooth_displayPincode", IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE}, 353 {"bluetooth_displayPincode", IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE},
352 {"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY}, 354 {"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY},
353 {"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY}, 355 {"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY},
(...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1906 1908
1907 #if defined(OS_CHROMEOS) 1909 #if defined(OS_CHROMEOS)
1908 chromeos::network_element::AddLocalizedStrings(html_source); 1910 chromeos::network_element::AddLocalizedStrings(html_source);
1909 #endif 1911 #endif
1910 policy_indicator::AddLocalizedStrings(html_source); 1912 policy_indicator::AddLocalizedStrings(html_source);
1911 1913
1912 html_source->SetJsonPath(kLocalizedStringsFile); 1914 html_source->SetJsonPath(kLocalizedStringsFile);
1913 } 1915 }
1914 1916
1915 } // namespace settings 1917 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698