Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3724)

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 1786263002: Remove uses of ENABLE_CONFIGURATION_POLICY from src/chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 8a6a175eee39b0e03ca805bef3a4fab513c2962d..89dafe60a08bd3fe47606b9d4726832300ac2f28 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -41,6 +41,8 @@
#include "chrome/browser/ui/webui/options/options_ui.h"
#include "chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h"
#include "chrome/browser/ui/webui/plugins/plugins_ui.h"
+#include "chrome/browser/ui/webui/policy_material_design_ui.h"
+#include "chrome/browser/ui/webui/policy_ui.h"
#include "chrome/browser/ui/webui/predictors/predictors_ui.h"
#include "chrome/browser/ui/webui/profiler_ui.h"
#include "chrome/browser/ui/webui/settings/md_settings_ui.h"
@@ -78,11 +80,6 @@
#include "chrome/browser/ui/webui/nacl_ui.h"
#endif
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "chrome/browser/ui/webui/policy_material_design_ui.h"
-#include "chrome/browser/ui/webui/policy_ui.h"
-#endif
-
#if defined(ENABLE_WEBRTC)
#include "chrome/browser/ui/webui/media/webrtc_logs_ui.h"
#endif
@@ -535,14 +532,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
#endif
#endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA
-#if defined(ENABLE_CONFIGURATION_POLICY)
if (url.host() == chrome::kChromeUIPolicyHost)
return &NewWebUI<PolicyUI>;
if (url.host() == chrome::kChromeUIMdPolicyHost &&
switches::MdPolicyPageEnabled()) {
return &NewWebUI<PolicyMaterialDesignUI>;
}
-#endif // defined(ENABLE_CONFIGURATION_POLICY)
#if defined(ENABLE_APP_LIST)
if (url.host() == chrome::kChromeUIAppListStartPageHost)

Powered by Google App Engine
This is Rietveld 408576698