MD Settings: Fix subpage URLS for CrOS

chrome/browser/ui/chrome_pages.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/chrome_pages.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 244 matching lines @@
   ShowSingletonTab(browser, GURL(kChromeUIPolicyURL));
 }
 
 void ShowSlow(Browser* browser) {
 #if defined(OS_CHROMEOS)
   ShowSingletonTab(browser, GURL(kChromeUISlowURL));
 #endif
 }
 
 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) {
   return (url.SchemeIs(content::kChromeUIScheme) &&
           (url.host_piece() == chrome::kChromeUISettingsHost ||
            url.host_piece() == chrome::kChromeUISettingsFrameHost) &&
           url.path_piece() == "/" + sub_page);
 }
 
 bool IsTrustedPopupWindowWithScheme(const Browser* browser,
@@ skipping 31 matching lines @@
   if (!base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
     if (sub_page == chrome::kAccessibilitySubPage) {
       sub_page_path = GenerateContentSettingsSearchQueryPath(
           IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY);
     } else if (sub_page == chrome::kBluetoothSubPage) {
       sub_page_path = GenerateContentSettingsSearchQueryPath(
           IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH);
     } 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
 
   if (::switches::SettingsWindowEnabled()) {
     content::RecordAction(base::UserMetricsAction("ShowOptions"));
     SettingsWindowManager::GetInstance()->ShowChromePageForProfile(
         profile, GetSettingsUrl(sub_page_path));
     return;
   }
@@ skipping 119 matching lines @@
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   if (manager->IsAuthenticated())
     ShowSettings(browser);
   else
     ShowBrowserSignin(browser, access_point);
 }
 #endif
 
 }  // namespace chrome