chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 9320056: Help: Implement the initial version of the cross-platform help/about page.

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 9320056: Help: Implement the initial version of the cross-platform help/about page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: String fix. Created 8 years, 11 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/webui/about_page/about_page_ui.cc ('k') | chrome/browser/ui/webui/help/help_handler.h » ('j') | chrome/browser/ui/webui/help/version_updater_chromeos.h » ('J')
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 8165aa7da32012430acda343aeaa3bd3d36739b0..fb323237ffd83ee048e4c9461f75fd072d3865cd 100644

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

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

@@ -13,7 +13,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

-#include "chrome/browser/ui/webui/about_page/about_page_ui.h"

+#include "chrome/browser/ui/webui/help/help_ui.h"

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

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

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

@@ -196,6 +196,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,

return &NewWebUI<FlashUI>;

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

return &NewWebUI<GpuInternalsUI>;

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

+ return &NewWebUI<HelpUI>;

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

return &NewWebUI<HistoryUI>;

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

@@ -269,8 +271,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,

return &NewWebUI<chromeos::SimUnlockUI>;

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

return &NewWebUI<SystemInfoUI>;

- if (url.host() == chrome::kChromeUIAboutPageFrameHost)

- return &NewWebUI<AboutPageUI>;

#endif // defined(OS_CHROMEOS)

/****************************************************************************