summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorseanparent@google.com <seanparent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-20 21:11:23 +0000
committerseanparent@google.com <seanparent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-20 21:11:23 +0000
commit706dbc20653f11019797dcb2bdfee2e9e83b0fba (patch)
tree7d3dd321ae64b4a9c572c20c2034e4551e693427 /chrome
parent054fb4d1dbb25a3673a9de612faf8c172805f670 (diff)
downloadchromium_src-706dbc20653f11019797dcb2bdfee2e9e83b0fba.zip
chromium_src-706dbc20653f11019797dcb2bdfee2e9e83b0fba.tar.gz
chromium_src-706dbc20653f11019797dcb2bdfee2e9e83b0fba.tar.bz2
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
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/options.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 777d2f7..873ea1f 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -95,7 +95,6 @@ function load() {
OptionsPage.register(BrowserOptions.getInstance());
OptionsPage.register(PersonalOptions.getInstance());
OptionsPage.register(AdvancedOptions.getInstance());
- OptionsPage.registerSubPage(AboutPage.getInstance());
OptionsPage.registerSubPage(AutoFillOptions.getInstance());
OptionsPage.registerSubPage(ContentSettings.getInstance());
OptionsPage.registerSubPage(PasswordsExceptions.getInstance());