chrome/browser/ui/webui/chrome_web_ui_factory.cc - Issue 7572022: Use bookmark manager to add/edit bookmark pages with webui_dialogs=1.

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_factory.cc

Issue 7572022: Use bookmark manager to add/edit bookmark pages with webui_dialogs=1. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Windows build compatibility. Created 9 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/chrome_web_ui_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc

index ef25dbbaba4c4ce27c914b049e12f8964a6dac77..07983b5376cb85cbd672f4ff085014648f64f261 100644

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

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

@@ -68,7 +68,7 @@

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

#endif

-#if defined(WEBUI_CERTIFICATE_VIEWER)

+#if defined(WEBUI_DIALOGS) && defined(OS_POSIX) && !defined(OS_MACOSX)

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

#endif

@@ -146,7 +146,7 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,

return &NewWebUI<BookmarksUI>;

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

return &NewWebUI<BugReportUI>;

-#if defined(WEBUI_CERTIFICATE_VIEWER)

+#if defined(WEBUI_DIALOGS) && defined(OS_POSIX) && !defined(OS_MACOSX)

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

return &NewWebUI<CertificateViewerUI>;

#endif

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »