chrome/browser/ui/webui/options/options_ui.cc - Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI.

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 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Merge head 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:

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 08474729c12f14a9d74957d02678a64f7f9939fc..98e7d8b28b2a6bdae221ab811c079c3c442eea8b 100644

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

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

@@ -28,6 +28,7 @@

#include "chrome/browser/ui/webui/options/core_options_handler.h"

#include "chrome/browser/ui/webui/options/font_settings_handler.h"

#include "chrome/browser/ui/webui/options/import_data_handler.h"

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

#include "chrome/browser/ui/webui/options/language_options_handler.h"

#include "chrome/browser/ui/webui/options/manage_profile_handler.h"

#include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"

@@ -210,6 +211,7 @@ OptionsUI::OptionsUI(TabContents* contents)

AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());

AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());

AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());

+ AddOptionsPageUIHandler(localized_strings, new IntentsSettingsHandler());

#if defined(OS_CHROMEOS)

AddOptionsPageUIHandler(localized_strings,

new chromeos::CrosLanguageOptionsHandler());