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

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

Issue 2620073002: Adds the touch calibration setting behind a chrome switch (Closed)
Patch Set: nits Created 3 years, 11 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/device_page/display.js ('k') | chromeos/chromeos_switches.h » ('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 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 {"displayOrientation", IDS_SETTINGS_DISPLAY_ORIENTATION}, 601 {"displayOrientation", IDS_SETTINGS_DISPLAY_ORIENTATION},
602 {"displayOrientationStandard", IDS_SETTINGS_DISPLAY_ORIENTATION_STANDARD}, 602 {"displayOrientationStandard", IDS_SETTINGS_DISPLAY_ORIENTATION_STANDARD},
603 {"displayOverscanPageText", IDS_SETTINGS_DISPLAY_OVERSCAN_TEXT}, 603 {"displayOverscanPageText", IDS_SETTINGS_DISPLAY_OVERSCAN_TEXT},
604 {"displayOverscanPageTitle", IDS_SETTINGS_DISPLAY_OVERSCAN_TITLE}, 604 {"displayOverscanPageTitle", IDS_SETTINGS_DISPLAY_OVERSCAN_TITLE},
605 {"displayOverscanSubtitle", IDS_SETTINGS_DISPLAY_OVERSCAN_SUBTITLE}, 605 {"displayOverscanSubtitle", IDS_SETTINGS_DISPLAY_OVERSCAN_SUBTITLE},
606 {"displayOverscanInstructions", 606 {"displayOverscanInstructions",
607 IDS_SETTINGS_DISPLAY_OVERSCAN_INSTRUCTIONS}, 607 IDS_SETTINGS_DISPLAY_OVERSCAN_INSTRUCTIONS},
608 {"displayOverscanResize", IDS_SETTINGS_DISPLAY_OVERSCAN_RESIZE}, 608 {"displayOverscanResize", IDS_SETTINGS_DISPLAY_OVERSCAN_RESIZE},
609 {"displayOverscanPosition", IDS_SETTINGS_DISPLAY_OVERSCAN_POSITION}, 609 {"displayOverscanPosition", IDS_SETTINGS_DISPLAY_OVERSCAN_POSITION},
610 {"displayOverscanReset", IDS_SETTINGS_DISPLAY_OVERSCAN_RESET}, 610 {"displayOverscanReset", IDS_SETTINGS_DISPLAY_OVERSCAN_RESET},
611 {"displayTouchCalibrationTitle",
612 IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TITLE},
613 {"displayTouchCalibrationText",
614 IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TEXT}
611 }; 615 };
612 AddLocalizedStringsBulk(html_source, display_strings, 616 AddLocalizedStringsBulk(html_source, display_strings,
613 arraysize(display_strings)); 617 arraysize(display_strings));
614 618
619 html_source->AddBoolean(
620 "enableTouchCalibrationSetting",
621 base::CommandLine::ForCurrentProcess()->HasSwitch(
622 chromeos::switches::kEnableTouchCalibrationSetting));
623
615 LocalizedString storage_strings[] = { 624 LocalizedString storage_strings[] = {
616 {"storageTitle", IDS_SETTINGS_STORAGE_TITLE}, 625 {"storageTitle", IDS_SETTINGS_STORAGE_TITLE},
617 {"storageItemInUse", IDS_SETTINGS_STORAGE_ITEM_IN_USE}, 626 {"storageItemInUse", IDS_SETTINGS_STORAGE_ITEM_IN_USE},
618 {"storageItemAvailable", IDS_SETTINGS_STORAGE_ITEM_AVAILABLE}, 627 {"storageItemAvailable", IDS_SETTINGS_STORAGE_ITEM_AVAILABLE},
619 {"storageItemDownloads", IDS_SETTINGS_STORAGE_ITEM_DOWNLOADS}, 628 {"storageItemDownloads", IDS_SETTINGS_STORAGE_ITEM_DOWNLOADS},
620 {"storageItemDriveCache", IDS_SETTINGS_STORAGE_ITEM_DRIVE_CACHE}, 629 {"storageItemDriveCache", IDS_SETTINGS_STORAGE_ITEM_DRIVE_CACHE},
621 {"storageItemBrowsingData", IDS_SETTINGS_STORAGE_ITEM_BROWSING_DATA}, 630 {"storageItemBrowsingData", IDS_SETTINGS_STORAGE_ITEM_BROWSING_DATA},
622 {"storageItemAndroid", IDS_SETTINGS_STORAGE_ITEM_ANDROID}, 631 {"storageItemAndroid", IDS_SETTINGS_STORAGE_ITEM_ANDROID},
623 {"storageItemOtherUsers", IDS_SETTINGS_STORAGE_ITEM_OTHER_USERS}, 632 {"storageItemOtherUsers", IDS_SETTINGS_STORAGE_ITEM_OTHER_USERS},
624 {"storageSizeComputing", IDS_SETTINGS_STORAGE_SIZE_CALCULATING}, 633 {"storageSizeComputing", IDS_SETTINGS_STORAGE_SIZE_CALCULATING},
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1855 #if defined(USE_NSS_CERTS) 1864 #if defined(USE_NSS_CERTS)
1856 AddCertificateManagerStrings(html_source); 1865 AddCertificateManagerStrings(html_source);
1857 #endif 1866 #endif
1858 1867
1859 policy_indicator::AddLocalizedStrings(html_source); 1868 policy_indicator::AddLocalizedStrings(html_source);
1860 1869
1861 html_source->SetJsonPath(kLocalizedStringsFile); 1870 html_source->SetJsonPath(kLocalizedStringsFile);
1862 } 1871 }
1863 1872
1864 } // namespace settings 1873 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/device_page/display.js ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698