chrome/browser/resources/options2/options.js - Issue 9181013: [uber page] Migrate remaining Personal options into Browser options.

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 9181013: [uber page] Migrate remaining Personal options into Browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: How about another rebase! (damn you generated_resources.grd) 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

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

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

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

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

@@ -23,7 +23,6 @@

var LanguageOptions = options.LanguageOptions;

var OptionsPage = options.OptionsPage;

var PasswordManager = options.PasswordManager;

-var PersonalOptions = options.PersonalOptions;

var Preferences = options.Preferences;

var ManageProfileOverlay = options.ManageProfileOverlay;

var ProxyOptions = options.ProxyOptions;

@@ -72,7 +71,6 @@

OptionsPage.registerSubPage(AdvancedOptions.getInstance(),

BrowserOptions.getInstance(),

[$('advancedOptionsButton')]);

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

if (cr.isChromeOS) {

OptionsPage.register(SystemOptions.getInstance());

OptionsPage.registerSubPage(LanguageOptions.getInstance(),

@@ -168,7 +166,7 @@

BrowserOptions.getInstance(),

[$('toolbarShowHomeButton')]);

OptionsPage.registerOverlay(ImportDataOverlay.getInstance(),

- PersonalOptions.getInstance());

+ BrowserOptions.getInstance());

OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(),

BrowserOptions.getInstance());

OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(),

@@ -183,7 +181,7 @@

OptionsPage.registerSubPage(ProxyOptions.getInstance(),

InternetOptions.getInstance());

OptionsPage.registerSubPage(ChangePictureOptions.getInstance(),

- PersonalOptions.getInstance(),

+ BrowserOptions.getInstance(),

[$('change-picture-button')]);

OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),

InternetOptions.getInstance());

« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »