MD Settings: Fix subpage URLS for CrOS

chrome/browser/ui/chrome_pages.cc

Index: chrome/browser/ui/chrome_pages.cc
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 443970abfb188bad281eaeeca273b7bcefbd86c1..6dea3c41769b4b1dc502b62c83baff2c8ca48dca 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -262,16 +262,7 @@ void ShowSlow(Browser* browser) {
 }
 
 GURL GetSettingsUrl(const std::string& sub_page) {
-  std::string url = std::string(kChromeUISettingsURL) + sub_page;
-#if defined(OS_CHROMEOS)
-  if (sub_page.find(kInternetOptionsSubPage, 0) != std::string::npos) {
-    std::string::size_type loc = sub_page.find("?", 0);
-    std::string network_page =
-        loc != std::string::npos ? sub_page.substr(loc) : std::string();
-    url = std::string(kChromeUISettingsURL) + network_page;

[stevenjb, 2017/02/15 20:41:23]

I'm not entirely sure what this was intended to do (even though I suspect I
added it), but it isn't necessary (I tested with old and new settings).

[tommycli, 2017/02/15 21:48:13]

Acknowledged.

-  }
-#endif
-  return GURL(url);
+  return GURL(std::string(kChromeUISettingsURL) + sub_page);
 }
 
 bool IsSettingsSubPage(const GURL& url, const std::string& sub_page) {
@@ -323,6 +314,15 @@ void ShowSettingsSubPageForProfile(Profile* profile,
     } else if (sub_page == chrome::kDateTimeSubPage) {
       sub_page_path = GenerateContentSettingsSearchQueryPath(
           IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
+    } else if (sub_page == chrome::kStylusSubPage ||
+               sub_page == chrome::kPowerSubPage) {
+      sub_page_path += "-overlay";
+    }
+  } else {
+    if (sub_page == chrome::kPowerSubPage) {
+      // TODO(stevenjbj/derat): Remove this once we have a 'power' subpage,
+      // crbug.com/633455.
+      sub_page_path = "device";
     }
   }
 #endif