| Index: chrome/browser/browser_about_handler.cc
|
| diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
|
| index 616d290ff5d589ef5c381f66653a565c3e39887e..ae7e9ba165b311b881f7be0cfb9281b0a435fb68 100644
|
| --- a/chrome/browser/browser_about_handler.cc
|
| +++ b/chrome/browser/browser_about_handler.cc
|
| @@ -55,8 +55,15 @@ bool WillHandleBrowserAboutURL(GURL* url,
|
| host = chrome::kChromeUISyncInternalsHost;
|
| // Redirect chrome://extensions.
|
| } else if (host == chrome::kChromeUIExtensionsHost) {
|
| - host = chrome::kChromeUIUberHost;
|
| - path = chrome::kChromeUIExtensionsHost + url->path();
|
| + // If the material design extensions page is enabled, it gets its own host.
|
| + // Otherwise, it's handled by the uber settings page.
|
| + if (::switches::MdExtensionsEnabled()) {
|
| + host = chrome::kChromeUIExtensionsHost;
|
| + path = url->path();
|
| + } else {
|
| + host = chrome::kChromeUIUberHost;
|
| + path = chrome::kChromeUIExtensionsHost + url->path();
|
| + }
|
| // Redirect chrome://settings/extensions (legacy URL).
|
| } else if (host == chrome::kChromeUISettingsHost &&
|
| url->path() == std::string("/") + chrome::kExtensionsSubPage) {
|
|
|