chrome/browser/resources/options2/options.js - Issue 9232010: [uber page] Migrate all elements in the 'System' (cros) page to new locations.

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/resources/options2/options.js

Issue 9232010: [uber page] Migrate all elements in the 'System' (cros) page to new locations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 8 years, 11 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/resources/options2/browser_options.js ('K') | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | chrome/browser/ui/webui/options2/browser_options_handler2.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options2/options.js

===================================================================

--- chrome/browser/resources/options2/options.js (revision 117867)

+++ chrome/browser/resources/options2/options.js (working copy)

@@ -72,9 +72,8 @@

BrowserOptions.getInstance(),

[$('advancedOptionsButton')]);

if (cr.isChromeOS) {

- OptionsPage.register(SystemOptions.getInstance());

OptionsPage.registerSubPage(LanguageOptions.getInstance(),

- SystemOptions.getInstance(),

+ AdvancedOptions.getInstance(),

[$('language-button')]);

OptionsPage.registerSubPage(

new OptionsPage('languageChewing',

@@ -186,15 +185,16 @@

OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),

InternetOptions.getInstance());

OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),

- SystemOptions.getInstance(),

- [$('modifier-keys-button')]);

+ BrowserOptions.getInstance(),

+ [$('keyboard-settings-button')]);

OptionsPage.registerOverlay(PointerOverlay.getInstance(),

- SystemOptions.getInstance());

+ BrowserOptions.getInstance(),

+ [$('pointer-settings-button')]);

OptionsPage.registerOverlay(BluetoothOptions.getInstance(),

- SystemOptions.getInstance(),

+ AdvancedOptions.getInstance(),

[$('bluetooth-add-device')]);

OptionsPage.registerOverlay(BluetoothPairing.getInstance(),

- SystemOptions.getInstance());

+ AdvancedOptions.getInstance());

}

Preferences.getInstance().initialize();