| Index: chrome/browser/resources/settings/route.js
|
| diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js
|
| index 9d5a7740bab4c663a27117f0d4420d967ad9bb3a..90ad40d729725aa963d052954aed012337b945e1 100644
|
| --- a/chrome/browser/resources/settings/route.js
|
| +++ b/chrome/browser/resources/settings/route.js
|
| @@ -100,11 +100,11 @@ cr.define('settings', function() {
|
| r.TRIGGERED_RESET_DIALOG =
|
| r.ADVANCED.createChild('/triggeredResetProfileSettings');
|
|
|
| -<if expr="chromeos">
|
| +// <if expr="chromeos">
|
| r.INTERNET = r.BASIC.createSection('/internet', 'internet');
|
| r.NETWORK_DETAIL = r.INTERNET.createChild('/networkDetail');
|
| r.KNOWN_NETWORKS = r.INTERNET.createChild('/knownNetworks');
|
| -</if>
|
| +// </if>
|
|
|
| r.APPEARANCE = r.BASIC.createSection('/appearance', 'appearance');
|
| r.FONTS = r.APPEARANCE.createChild('/fonts');
|
| @@ -115,18 +115,18 @@ cr.define('settings', function() {
|
| r.SEARCH = r.BASIC.createSection('/search', 'search');
|
| r.SEARCH_ENGINES = r.SEARCH.createChild('/searchEngines');
|
|
|
| -<if expr="chromeos">
|
| +// <if expr="chromeos">
|
| r.ANDROID_APPS = r.BASIC.createSection('/androidApps', 'androidApps');
|
| -</if>
|
| +// </if>
|
|
|
| r.ON_STARTUP = r.BASIC.createSection('/onStartup', 'onStartup');
|
|
|
| r.PEOPLE = r.BASIC.createSection('/people', 'people');
|
| r.SYNC = r.PEOPLE.createChild('/syncSetup');
|
| -<if expr="not chromeos">
|
| +// <if expr="not chromeos">
|
| r.MANAGE_PROFILE = r.PEOPLE.createChild('/manageProfile');
|
| -</if>
|
| -<if expr="chromeos">
|
| +// </if>
|
| +// <if expr="chromeos">
|
| r.CHANGE_PICTURE = r.PEOPLE.createChild('/changePicture');
|
| r.ACCOUNTS = r.PEOPLE.createChild('/accounts');
|
| r.LOCK_SCREEN = r.PEOPLE.createChild('/lockScreen');
|
| @@ -137,7 +137,7 @@ cr.define('settings', function() {
|
| r.DISPLAY = r.DEVICE.createChild('/display');
|
| r.STYLUS = r.DEVICE.createChild('/stylus');
|
| r.STORAGE = r.DEVICE.createChild('/storage');
|
| -</if>
|
| +// </if>
|
|
|
| r.PRIVACY = r.ADVANCED.createSection('/privacy', 'privacy');
|
| r.CERTIFICATES = r.PRIVACY.createChild('/certificates');
|
| @@ -171,10 +171,10 @@ cr.define('settings', function() {
|
| r.SITE_SETTINGS_ZOOM_LEVELS = r.SITE_SETTINGS.createChild('zoomLevels');
|
| r.SITE_SETTINGS_PDF_DOCUMENTS = r.SITE_SETTINGS.createChild('pdfDocuments');
|
|
|
| -<if expr="chromeos">
|
| +// <if expr="chromeos">
|
| r.DATETIME = r.ADVANCED.createSection('/dateTime', 'dateTime');
|
| r.BLUETOOTH = r.ADVANCED.createSection('/bluetooth', 'bluetooth');
|
| -</if>
|
| +// </if>
|
|
|
| r.PASSWORDS =
|
| r.ADVANCED.createSection('/passwordsAndForms', 'passwordsAndForms');
|
| @@ -182,21 +182,21 @@ cr.define('settings', function() {
|
| r.MANAGE_PASSWORDS = r.PASSWORDS.createChild('/passwords');
|
|
|
| r.LANGUAGES = r.ADVANCED.createSection('/languages', 'languages');
|
| -<if expr="chromeos">
|
| +// <if expr="chromeos">
|
| r.INPUT_METHODS = r.LANGUAGES.createChild('/inputMethods');
|
| -</if>
|
| -<if expr="not is_macosx">
|
| +// </if>
|
| +// <if expr="not is_macosx">
|
| r.EDIT_DICTIONARY = r.LANGUAGES.createChild('/editDictionary');
|
| -</if>
|
| +// </if>
|
|
|
| r.DOWNLOADS = r.ADVANCED.createSection('/downloads', 'downloads');
|
|
|
| r.PRINTING = r.ADVANCED.createSection('/printing', 'printing');
|
| r.CLOUD_PRINTERS = r.PRINTING.createChild('/cloudPrinters');
|
| -<if expr="chromeos">
|
| +// <if expr="chromeos">
|
| r.CUPS_PRINTERS = r.PRINTING.createChild('/cupsPrinters');
|
| r.CUPS_PRINTER_DETAIL = r.CUPS_PRINTERS.createChild('/cupsPrinterDetails');
|
| -</if>
|
| +// </if>
|
|
|
| r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');
|
| r.MANAGE_ACCESSIBILITY = r.ACCESSIBILITY.createChild('/manageAccessibility');
|
| @@ -204,12 +204,12 @@ cr.define('settings', function() {
|
| r.SYSTEM = r.ADVANCED.createSection('/system', 'system');
|
| r.RESET = r.ADVANCED.createSection('/reset', 'reset');
|
|
|
| -<if expr="chromeos">
|
| +// <if expr="chromeos">
|
| // "About" is the only section in About, but we still need to create the route
|
| // in order to show the subpage on Chrome OS.
|
| r.ABOUT_ABOUT = r.ABOUT.createSection('/help/about', 'about');
|
| r.DETAILED_BUILD_INFO = r.ABOUT_ABOUT.createChild('/help/details');
|
| -</if>
|
| +// </if>
|
|
|
| var routeObservers_ = new Set();
|
|
|
|
|