Index: chrome/browser/browser_about_handler.cc |
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc |
index e576359fc6d2a5bd135e3800023ef3ac7052486b..1195482a1ec45130216b6e7fed5bbdb626897a52 100644 |
--- a/chrome/browser/browser_about_handler.cc |
+++ b/chrome/browser/browser_about_handler.cc |
@@ -23,10 +23,6 @@ |
#include "content/public/common/content_features.h" |
#include "extensions/features/features.h" |
-#if !defined(OS_ANDROID) |
-#include "chrome/browser/ui/webui/md_history_ui.h" |
-#endif |
- |
#if defined(OS_ANDROID) |
#include "chrome/browser/android/chrome_feature_list.h" |
#endif |
@@ -87,24 +83,9 @@ bool WillHandleBrowserAboutURL(GURL* url, |
#endif // BUILDFLAG(ENABLE_EXTENSIONS) |
// Redirect chrome://history. |
} else if (host == chrome::kChromeUIHistoryHost) { |
-#if defined(OS_ANDROID) |
- // TODO(twellington): remove this after native Android history launches. |
- // See http://crbug.com/654071. |
sky
2017/04/27 22:41:04
Has native android history launcheD?
Dan Beam
2017/04/28 03:17:45
it's going to stable in M58 as we speak :D
|
- if (!base::FeatureList::IsEnabled(features::kNativeAndroidHistoryManager)) { |
- // On Android, redirect directly to chrome://history-frame since |
- // uber page is unsupported. |
- host = chrome::kChromeUIHistoryFrameHost; |
- } |
-#else |
- // Material design history is handled on the top-level chrome://history |
- // host. |
- if (base::FeatureList::IsEnabled(features::kMaterialDesignHistory)) { |
- host = chrome::kChromeUIHistoryHost; |
- path = url->path(); |
- } else { |
- host = chrome::kChromeUIUberHost; |
- path = chrome::kChromeUIHistoryHost + url->path(); |
- } |
+#if !defined(OS_ANDROID) |
sky
2017/04/27 22:41:04
Move the ifdef up a line?
Dan Beam
2017/04/28 03:17:45
Done.
|
+ host = chrome::kChromeUIHistoryHost; |
+ path = url->path(); |
#endif |
// Redirect chrome://settings, unless MD settings is enabled. |
} else if (host == chrome::kChromeUISettingsHost) { |