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

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

Issue 2819046: Make the personal stuff page viewable. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Remove the two old line for sync in gypi 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 | « no previous file | chrome/browser/dom_ui/personal_options_handler.cc » ('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 7a6f3a4bb01b5e211911988154bb2e66d5350c21..d3ee847364c65d18cab391f02364cb0f213e4ba2 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/dom_ui/content_settings_handler.h"
#include "chrome/browser/dom_ui/core_options_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"
@@ -117,10 +118,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 LanguageHangulOptionsHandler());
@@ -128,7 +130,6 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
AddOptionsPageUIHandler(localized_strings,
new chromeos::AccountsOptionsHandler());
#endif
- AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
// |localized_strings| ownership is taken over by this constructor.
OptionsUIHTMLSource* html_source =
« no previous file with comments | « no previous file | chrome/browser/dom_ui/personal_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698