chrome/browser/dom_ui/options_ui.cc - Issue 3069008: remove the chromeos include and reland

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 3069008: remove the chromeos include and reland (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: 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:

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 84d553d09d986ac89eb86004fda26404f7f73e3b..8aa97de51cce652691968f6d69cc8c05c1d8eeee 100644

--- a/chrome/browser/dom_ui/options_ui.cc

+++ b/chrome/browser/dom_ui/options_ui.cc

@@ -25,8 +25,10 @@

#include "chrome/browser/dom_ui/content_settings_handler.h"

#include "chrome/browser/dom_ui/core_options_handler.h"

#include "chrome/browser/dom_ui/font_settings_handler.h"

+#include "chrome/browser/dom_ui/import_data_handler.h"

#include "chrome/browser/dom_ui/personal_options_handler.h"

#include "chrome/browser/dom_ui/search_engine_manager_handler.h"

+#include "chrome/browser/dom_ui/stop_syncing_handler.h"

#include "chrome/browser/dom_ui/sync_options_handler.h"

#include "chrome/browser/dom_ui/dom_ui_theme_source.h"

#include "chrome/browser/metrics/user_metrics.h"

@@ -133,6 +135,8 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {

AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());

AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler());

AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());

+ AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());

+ AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());

AddOptionsPageUIHandler(localized_strings, new SyncOptionsHandler());

#if defined(OS_CHROMEOS)

AddOptionsPageUIHandler(localized_strings,