Commit 706dbc20 authored by seanparent@google.com's avatar seanparent@google.com

Fixing merge regression.

BUG=none
TEST=Should fix DOM options on non-chromeos platforms.

Review URL: http://codereview.chromium.org/3152037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56912 0039d316-1c4b-4281-b951-d872f2087c98
parent 054fb4d1
...@@ -95,7 +95,6 @@ function load() { ...@@ -95,7 +95,6 @@ function load() {
OptionsPage.register(BrowserOptions.getInstance()); OptionsPage.register(BrowserOptions.getInstance());
OptionsPage.register(PersonalOptions.getInstance()); OptionsPage.register(PersonalOptions.getInstance());
OptionsPage.register(AdvancedOptions.getInstance()); OptionsPage.register(AdvancedOptions.getInstance());
OptionsPage.registerSubPage(AboutPage.getInstance());
OptionsPage.registerSubPage(AutoFillOptions.getInstance()); OptionsPage.registerSubPage(AutoFillOptions.getInstance());
OptionsPage.registerSubPage(ContentSettings.getInstance()); OptionsPage.registerSubPage(ContentSettings.getInstance());
OptionsPage.registerSubPage(PasswordsExceptions.getInstance()); OptionsPage.registerSubPage(PasswordsExceptions.getInstance());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment