chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 1786263002: Remove uses of ENABLE_CONFIGURATION_POLICY from src/chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: sort 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

« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('k') | chrome/common/extensions/api/storage/storage_schema_manifest_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e1601674a00286e571d9a71dee7c1fbc09e8a0cd..9900da0315d215cb682bd5b81f835b4ef4081fd9 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -42,6 +42,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"

@@ -79,11 +81,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

@@ -531,14 +528,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)