chrome/browser/ui/webui/options/options_ui.cc - Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window.

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/options/options_ui.cc

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: simplify Created 6 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

« chrome/browser/ui/webui/options/help_overlay_handler.h ('K') | « chrome/browser/ui/webui/options/help_overlay_handler.cc ('k') | chrome/browser/ui/webui/options/options_ui_browsertest.cc » ('j') | chrome/browser/ui/webui/options/settings_format_browsertest.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/options_ui.cc

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

index 68727d5e609a8bca642e0e50bc54d8cd70f0669d..5cac3eb5ba59ea0a0c454fd1a986657bc5379c0d 100644

--- a/chrome/browser/ui/webui/options/options_ui.cc

+++ b/chrome/browser/ui/webui/options/options_ui.cc

@@ -89,6 +89,7 @@

#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"

#include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"

#include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"

+#include "chrome/browser/ui/webui/options/help_overlay_handler.h"

#endif

#if defined(USE_NSS)

@@ -314,6 +315,7 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)

new chromeos::options::DisplayOverscanHandler());

AddOptionsPageUIHandler(localized_strings,

new chromeos::options::InternetOptionsHandler());

+ AddOptionsPageUIHandler(localized_strings, new options::HelpOverlayHandler());

AddOptionsPageUIHandler(localized_strings,

new chromeos::options::KeyboardHandler());