Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: chrome/browser/dom_ui/options_ui.cc

Issue 2935011: Initial accounts options page. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: use ListItem directly for now per arv Created 10 years, 5 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
« no previous file with comments | « chrome/browser/dom_ui/core_options_handler.cc ('k') | chrome/browser/resources/options.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/options_ui.cc
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc
index d10868bfa26c6ceaa50fe0d110ea83c3bb61e6e6..7a6f3a4bb01b5e211911988154bb2e66d5350c21 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -40,10 +40,12 @@
#include "grit/theme_resources.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/dom_ui/sync_options_handler.h"
+#include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h"
+#include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h"
#include "chrome/browser/chromeos/dom_ui/labs_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
@@ -105,8 +107,14 @@ void OptionsPageUIHandler::UserMetricsRecordAction(
OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
DictionaryValue* localized_strings = new DictionaryValue();
- // TODO(zelidrag): Add all other page handlers here as we implement them.
+#if defined(OS_CHROMEOS)
+ AddOptionsPageUIHandler(localized_strings,
+ new chromeos::CoreChromeOSOptionsHandler());
+#else
AddOptionsPageUIHandler(localized_strings, new CoreOptionsHandler());
+#endif
+
+ // 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 AdvancedOptionsHandler());
@@ -117,6 +125,8 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
AddOptionsPageUIHandler(localized_strings,
new LanguageHangulOptionsHandler());
AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
+ AddOptionsPageUIHandler(localized_strings,
+ new chromeos::AccountsOptionsHandler());
#endif
AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
« no previous file with comments | « chrome/browser/dom_ui/core_options_handler.cc ('k') | chrome/browser/resources/options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698