chrome/browser/ui/webui/options/options_ui.cc - Issue 15966004: cros: Move kiosk settings to extensions 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/options/options_ui.cc

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix space Created 7 years, 7 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 11cfa3577ed20425160c67478dfffdafc1368347..502bec43d95c1a6d3f630a18d73f012b9b04d1a2 100644

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

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

@@ -73,7 +73,6 @@

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

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

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

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

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

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

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

@@ -292,8 +291,6 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)

AddOptionsPageUIHandler(localized_strings,

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

AddOptionsPageUIHandler(localized_strings,

- new chromeos::options::KioskAppsHandler());

- AddOptionsPageUIHandler(localized_strings,

new chromeos::options::LanguageHangulHandler());

AddOptionsPageUIHandler(localized_strings,

new chromeos::options::LanguageMozcHandler());