chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 893323002: Add a basic stub Polymer settings page at chrome://md-settings.

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 893323002: Add a basic stub Polymer settings page at chrome://md-settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Do cleanups in md_settings.html and md_settings_ui.h (addressing comments). Created 5 years, 10 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

« chrome/browser/resources/md_settings/md_settings.html ('K') | « chrome/browser/resources/md_settings/md_settings.html ('k') | chrome/browser/ui/webui/md_settings_ui.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 120d49b201c8023e392cb767a2b59c88e72820c8..d2a12736a74f899442b933850e53fb36da98e4f5 100644

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

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

@@ -36,6 +36,7 @@

#include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"

#include "chrome/browser/ui/webui/invalidations_ui.h"

#include "chrome/browser/ui/webui/local_state/local_state_ui.h"

+#include "chrome/browser/ui/webui/md_settings_ui.h"

#include "chrome/browser/ui/webui/memory_internals/memory_internals_ui.h"

#include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"

#include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"

@@ -367,6 +368,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<IdentityInternalsUI>;

if (url.host() == chrome::kChromeUINewTabHost)

return &NewWebUI<NewTabUI>;

+ if (url.host() == chrome::kChromeUIMdSettingsHost &&

+ ::switches::MdSettingsEnabled()) {

+ return &NewWebUI<MdSettingsUI>;

+ }

// Android does not support plugins for now.

if (url.host() == chrome::kChromeUIPluginsHost)

return &NewWebUI<PluginsUI>;