diff options
| author | sargrass@google.com <sargrass@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 21:31:06 +0000 |
|---|---|---|
| committer | sargrass@google.com <sargrass@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 21:31:06 +0000 |
| commit | ed0cd3234ce8cbfdbf98a824d4a8f868734c5f86 (patch) | |
| tree | 47c5aa0476e0c34a2de835b8bbcb25ffd917606c /chrome/browser/dom_ui/options_ui.cc | |
| parent | 0f13d43543d0ede90ffeb264b2d3427837154807 (diff) | |
| download | chromium_src-ed0cd3234ce8cbfdbf98a824d4a8f868734c5f86.zip chromium_src-ed0cd3234ce8cbfdbf98a824d4a8f868734c5f86.tar.gz chromium_src-ed0cd3234ce8cbfdbf98a824d4a8f868734c5f86.tar.bz2 | |
Add toolkit for personal stuff filter
BUG=48883
TEST=Exercise Personal Stuff page via --enabled-tabbed-options
Review URL: http://codereview.chromium.org/3056010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/options_ui.cc')
| -rw-r--r-- | chrome/browser/dom_ui/options_ui.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc index eec00be..ddadee7 100644 --- a/chrome/browser/dom_ui/options_ui.cc +++ b/chrome/browser/dom_ui/options_ui.cc @@ -23,6 +23,7 @@ #include "chrome/browser/dom_ui/core_options_handler.h" #include "chrome/browser/dom_ui/font_settings_handler.h" #include "chrome/browser/dom_ui/personal_options_handler.h" +#include "chrome/browser/dom_ui/sync_options_handler.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" @@ -48,7 +49,6 @@ #include "chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h" #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h" #include "chrome/browser/chromeos/dom_ui/language_options_handler.h" -#include "chrome/browser/chromeos/dom_ui/sync_options_handler.h" #include "chrome/browser/chromeos/dom_ui/system_options_handler.h" #endif @@ -120,10 +120,11 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) { // TODO(zelidrag): Add all other page handlers here as we implement them. AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler()); AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler()); + AddOptionsPageUIHandler(localized_strings, new SyncOptionsHandler()); AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler()); + AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); #if defined(OS_CHROMEOS) AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler()); - AddOptionsPageUIHandler(localized_strings, new SyncOptionsHandler()); AddOptionsPageUIHandler(localized_strings, new LabsHandler()); AddOptionsPageUIHandler(localized_strings, new LanguageChewingOptionsHandler()); |