Index: chrome/browser/resources/settings/route.js |
diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js |
index 2890223f713f47865261f0d899d031def5738b24..1d3496baa53825bda5d9738a01697bc316a2b2bb 100644 |
--- a/chrome/browser/resources/settings/route.js |
+++ b/chrome/browser/resources/settings/route.js |
@@ -113,7 +113,7 @@ cr.define('settings', function() { |
r.ADVANCED.createChild('/triggeredResetProfileSettings'); |
r.TRIGGERED_RESET_DIALOG.isNavigableDialog = true; |
-// <if expr="chromeos"> |
+ // <if expr="chromeos"> |
r.INTERNET = r.BASIC.createSection('/internet', 'internet'); |
r.INTERNET_NETWORKS = r.INTERNET.createChild('/networks'); |
r.NETWORK_CONFIG = r.INTERNET.createChild('/networkConfig'); |
@@ -121,7 +121,7 @@ cr.define('settings', function() { |
r.KNOWN_NETWORKS = r.INTERNET.createChild('/knownNetworks'); |
r.BLUETOOTH = r.BASIC.createSection('/bluetooth', 'bluetooth'); |
r.BLUETOOTH_DEVICES = r.BLUETOOTH.createChild('/bluetoothDevices'); |
-// </if> |
+ // </if> |
r.APPEARANCE = r.BASIC.createSection('/appearance', 'appearance'); |
r.FONTS = r.APPEARANCE.createChild('/fonts'); |
@@ -132,19 +132,19 @@ 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'); |
r.ANDROID_APPS_DETAILS = r.ANDROID_APPS.createChild('/androidApps/details'); |
-// </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'); |
@@ -157,7 +157,7 @@ cr.define('settings', function() { |
r.DISPLAY = r.DEVICE.createChild('/display'); |
r.STORAGE = r.DEVICE.createChild('/storage'); |
r.POWER = r.DEVICE.createChild('/power'); |
-// </if> |
+ // </if> |
r.PRIVACY = r.ADVANCED.createSection('/privacy', 'privacy'); |
r.CERTIFICATES = r.PRIVACY.createChild('/certificates'); |
@@ -204,9 +204,9 @@ cr.define('settings', function() { |
r.SITE_SETTINGS_PROTECTED_CONTENT = |
r.SITE_SETTINGS.createChild('protectedContent'); |
-// <if expr="chromeos"> |
+ // <if expr="chromeos"> |
r.DATETIME = r.ADVANCED.createSection('/dateTime', 'dateTime'); |
-// </if> |
+ // </if> |
r.PASSWORDS = |
r.ADVANCED.createSection('/passwordsAndForms', 'passwordsAndForms'); |
@@ -214,36 +214,36 @@ 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'); |
-// <if expr="chromeos"> |
+ // <if expr="chromeos"> |
r.MANAGE_ACCESSIBILITY = r.ACCESSIBILITY.createChild('/manageAccessibility'); |
-// </if> |
+ // </if> |
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(); |
@@ -359,7 +359,9 @@ cr.define('settings', function() { |
}; |
/** @return {!settings.Route} */ |
- var getCurrentRoute = function() { return currentRoute; }; |
+ var getCurrentRoute = function() { |
+ return currentRoute; |
+ }; |
/** @return {!URLSearchParams} */ |
var getQueryParameters = function() { |
@@ -410,8 +412,7 @@ cr.define('settings', function() { |
* this navigates to the immediate parent. This will never exit Settings. |
*/ |
var navigateToPreviousRoute = function() { |
- var previousRoute = |
- window.history.state && |
+ var previousRoute = window.history.state && |
assert(getRouteForPath(/** @type {string} */ (window.history.state))); |
if (previousRoute && previousRoute.depth <= currentRoute.depth) |
@@ -422,8 +423,9 @@ cr.define('settings', function() { |
window.addEventListener('popstate', function(event) { |
// On pop state, do not push the state onto the window.history again. |
- setCurrentRoute(getRouteForPath(window.location.pathname) || Route.BASIC, |
- new URLSearchParams(window.location.search), true); |
+ setCurrentRoute( |
+ getRouteForPath(window.location.pathname) || Route.BASIC, |
+ new URLSearchParams(window.location.search), true); |
}); |
return { |