[CrOS settings] Updated OS route path (SIGNOUT) string

Before this CL some os and browser routes had the same name. This was
a bit confusing. If a some c++ code called '/signout', it is not clear
if this url is a chrome or browser subpage. A distinction needed to be
made. This CL renames OS specific route SIGN_OUT, which is shared with
browser routes to a more distinguishable name OS_SIGN_OUT. Allowing this
bug(990169) to be unblocked.

Bug: 990169
Change-Id: I0733982bc48284d184a0cfdb853ef234ccc1458c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2129992
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756575}

chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js

@@ -174,7 +174,7 @@ Polymer({
   /** @protected */
   currentRouteChanged() {
     if (settings.Router.getInstance().getCurrentRoute() ==
-        settings.routes.SIGN_OUT) {
+        settings.routes.OS_SIGN_OUT) {
       // If the sync status has not been fetched yet, optimistically display
       // the sign-out dialog. There is another check when the sync status is
       // fetched. The dialog will be closed when the user is not signed in.
@@ -293,14 +293,14 @@ Polymer({
     cr.ui.focusWithoutInk(assert(this.$$('#disconnectButton')));
 
     if (settings.Router.getInstance().getCurrentRoute() ==
-        settings.routes.SIGN_OUT) {
+        settings.routes.OS_SIGN_OUT) {
       settings.Router.getInstance().navigateToPreviousRoute();
     }
   },
 
   /** @private */
   onDisconnectTap_() {
-    settings.Router.getInstance().navigateTo(settings.routes.SIGN_OUT);
+    settings.Router.getInstance().navigateTo(settings.routes.OS_SIGN_OUT);
   },
 
   /** @private */

chrome/browser/resources/settings/chromeos/os_route.js

@@ -14,8 +14,8 @@ cr.define('settings', function() {
     r.BASIC = new settings.Route('/');
     r.ABOUT = new settings.Route('/help');
 
-    r.SIGN_OUT = r.BASIC.createChild('/signOut');
-    r.SIGN_OUT.isNavigableDialog = true;
+    r.OS_SIGN_OUT = r.BASIC.createChild('/osSignOut');
+    r.OS_SIGN_OUT.isNavigableDialog = true;
 
     r.OS_SEARCH = r.BASIC.createSection('/osSearch', 'osSearch');
     if (!loadTimeData.getBoolean('isGuest')) {

chrome/browser/resources/settings/chromeos/os_settings_routes.js

@@ -57,6 +57,7 @@
  *   OS_PRIVACY: !settings.Route,
  *   OS_RESET: !settings.Route,
  *   OS_SEARCH: !settings.Route,
+ *   OS_SIGN_OUT: !settings.Route,
  *   OS_SYNC: !settings.Route,
  *   OS_PEOPLE: !settings.Route,
  *   PERSONALIZATION: !settings.Route,
@@ -67,7 +68,6 @@
  *   POWER: !settings.Route,
  *   PRIVACY: !settings.Route,
  *   SEARCH: !settings.Route,
- *   SIGN_OUT: !settings.Route,
  *   SMART_LOCK: !settings.Route,
  *   SMB_SHARES: !settings.Route,
  *   STORAGE: !settings.Route,

chrome/browser/resources/settings/people_page/BUILD.gn

@@ -142,7 +142,7 @@ js_library("sync_account_control") {
   deps = [
     ":profile_info_browser_proxy",
     ":sync_browser_proxy",
-    "..:router",
+    "..:route",
     "../prefs:prefs_behavior",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/js:icon",

chrome/common/webui_url_constants.cc

@@ -434,6 +434,7 @@ const char kOsPrintingSubPage[] = "osPrinting";
 const char kOsPrivacySubPage[] = "osPrivacy";
 const char kOsResetSubPage[] = "osReset";
 const char kOsSearchSubPage[] = "osSearch";
+const char kOsSignOutSubPage[] = "osSignOut";
 const char kPluginVmDetailsSubPage[] = "pluginVm/details";
 const char kPluginVmSharedPathsSubPage[] = "pluginVm/sharedPaths";
 const char kPointerOverlaySubPage[] = "pointer-overlay";
@@ -496,6 +497,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kOsPrivacySubPage,
       kOsResetSubPage,
       kOsSearchSubPage,
+      kOsSignOutSubPage,
       kPointerOverlaySubPage,
       kPowerSubPage,
       kSmartLockSettingsSubPage,

chrome/common/webui_url_constants.h

@@ -394,6 +394,7 @@ extern const char kOsPrintingSubPage[];
 extern const char kOsPrivacySubPage[];
 extern const char kOsResetSubPage[];
 extern const char kOsSearchSubPage[];
+extern const char kOsSignOutSubPage[];
 extern const char kPluginVmDetailsSubPage[];
 extern const char kPluginVmSharedPathsSubPage[];
 extern const char kPointerOverlaySubPage[];