chrome/browser/ui/webui/options/options_ui.cc - Issue 8366016: Split out bluetooth UI handler from system UI handler.

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 8366016: Split out bluetooth UI handler from system UI handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge with trunk. Created 9 years, 2 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 1f3807f555a89be41a562e308f7659fad4c2ea72..00b9ec755c36b581e520d23f1572dc51c59fd3a8 100644

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

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

@@ -61,6 +61,7 @@

#if defined(OS_CHROMEOS)

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

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

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

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

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

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

@@ -236,6 +237,8 @@ OptionsUI::OptionsUI(TabContents* contents)

new chromeos::AboutPageHandler());

AddOptionsPageUIHandler(localized_strings,

new chromeos::AccountsOptionsHandler());

+ AddOptionsPageUIHandler(localized_strings,

+ new chromeos::BluetoothOptionsHandler());

AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());

AddOptionsPageUIHandler(localized_strings,

new chromeos::LanguageChewingHandler());