chrome/browser/ui/webui/options/options_ui.cc - Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined

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/ui/webui/options/options_ui.cc

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More bauerb Comments Created 6 years, 4 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

« chrome/browser/ui/webui/options/create_profile_handler.h ('K') | « chrome/browser/ui/webui/options/create_profile_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/options_ui.cc

diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc

index 5d57734eefd494cdaefb492d3df357004d82f98c..60e8d0080ecf3ee5d38d465685ba11e4ba37dd1c 100644

--- a/chrome/browser/ui/webui/options/options_ui.cc

+++ b/chrome/browser/ui/webui/options/options_ui.cc

@@ -39,9 +39,6 @@

#include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h"

#include "chrome/browser/ui/webui/options/language_options_handler.h"

#include "chrome/browser/ui/webui/options/manage_profile_handler.h"

-#include "chrome/browser/ui/webui/options/managed_user_create_confirm_handler.h"

-#include "chrome/browser/ui/webui/options/managed_user_import_handler.h"

-#include "chrome/browser/ui/webui/options/managed_user_learn_more_handler.h"

#include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"

#include "chrome/browser/ui/webui/options/password_manager_handler.h"

#include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"

@@ -68,6 +65,12 @@

#include "ui/base/webui/web_ui_util.h"

#include "url/gurl.h"

+#if defined(ENABLE_MANAGED_USERS)

+#include "chrome/browser/ui/webui/options/managed_user_create_confirm_handler.h"

+#include "chrome/browser/ui/webui/options/managed_user_import_handler.h"

+#include "chrome/browser/ui/webui/options/managed_user_learn_more_handler.h"

+#endif

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/system/pointer_device_observer.h"

#include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"

@@ -284,10 +287,12 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)

AddOptionsPageUIHandler(localized_strings,

new LanguageDictionaryOverlayHandler());

AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());

+#if defined(ENABLE_MANAGED_USERS)

AddOptionsPageUIHandler(localized_strings,

new ManagedUserCreateConfirmHandler());

AddOptionsPageUIHandler(localized_strings, new ManagedUserImportHandler());

AddOptionsPageUIHandler(localized_strings, new ManagedUserLearnMoreHandler());

+#endif

AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());

AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler());

AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());