chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 10820031: Modifications to performance monitor UI to address real webui.

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 10820031: Modifications to performance monitor UI to address real webui. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Revised build config to mollify Android tryserver Created 8 years, 4 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:

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 3dc1f1abed04da8cafb5739f66f1f56c1aedb604..f730e4c83e215abbff258429ed8f3606c176f029 100644

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

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

@@ -39,6 +39,7 @@

#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"

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

#include "chrome/browser/ui/webui/options2/options_ui.h"

+#include "chrome/browser/ui/webui/performance_monitor/web_ui.h"

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

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

#include "chrome/browser/ui/webui/predictors/predictors_ui.h"

@@ -263,6 +264,9 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

// Android does not support plugins for now.

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

return &NewWebUI<PluginsUI>;

+ // Performance monitoring page is not on Android for now.

+ if (url.host() == chrome::kChromeUIPerformanceMonitorHost)

+ return &NewWebUI<performance_monitor::WebUI>;

#endif

#if defined(ENABLE_EXTENSIONS)

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