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

Side by Side 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, 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/ui/webui/options/cookies_view_handler.h" 32 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
33 #include "chrome/browser/ui/webui/options/core_options_handler.h" 33 #include "chrome/browser/ui/webui/options/core_options_handler.h"
34 #include "chrome/browser/ui/webui/options/create_profile_handler.h" 34 #include "chrome/browser/ui/webui/options/create_profile_handler.h"
35 #include "chrome/browser/ui/webui/options/font_settings_handler.h" 35 #include "chrome/browser/ui/webui/options/font_settings_handler.h"
36 #include "chrome/browser/ui/webui/options/handler_options_handler.h" 36 #include "chrome/browser/ui/webui/options/handler_options_handler.h"
37 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h" 37 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h"
38 #include "chrome/browser/ui/webui/options/import_data_handler.h" 38 #include "chrome/browser/ui/webui/options/import_data_handler.h"
39 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h" 39 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h"
40 #include "chrome/browser/ui/webui/options/language_options_handler.h" 40 #include "chrome/browser/ui/webui/options/language_options_handler.h"
41 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" 41 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
42 #include "chrome/browser/ui/webui/options/managed_user_create_confirm_handler.h"
43 #include "chrome/browser/ui/webui/options/managed_user_import_handler.h"
44 #include "chrome/browser/ui/webui/options/managed_user_learn_more_handler.h"
45 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" 42 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
46 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 43 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
47 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h" 44 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"
48 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 45 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
49 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 46 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
50 #include "chrome/browser/ui/webui/sync_setup_handler.h" 47 #include "chrome/browser/ui/webui/sync_setup_handler.h"
51 #include "chrome/browser/ui/webui/theme_source.h" 48 #include "chrome/browser/ui/webui/theme_source.h"
52 #include "chrome/common/url_constants.h" 49 #include "chrome/common/url_constants.h"
53 #include "content/public/browser/notification_types.h" 50 #include "content/public/browser/notification_types.h"
54 #include "content/public/browser/render_frame_host.h" 51 #include "content/public/browser/render_frame_host.h"
55 #include "content/public/browser/url_data_source.h" 52 #include "content/public/browser/url_data_source.h"
56 #include "content/public/browser/web_contents.h" 53 #include "content/public/browser/web_contents.h"
57 #include "content/public/browser/web_contents_delegate.h" 54 #include "content/public/browser/web_contents_delegate.h"
58 #include "content/public/browser/web_ui.h" 55 #include "content/public/browser/web_ui.h"
59 #include "grit/chromium_strings.h" 56 #include "grit/chromium_strings.h"
60 #include "grit/generated_resources.h" 57 #include "grit/generated_resources.h"
61 #include "grit/locale_settings.h" 58 #include "grit/locale_settings.h"
62 #include "grit/options_resources.h" 59 #include "grit/options_resources.h"
63 #include "grit/theme_resources.h" 60 #include "grit/theme_resources.h"
64 #include "net/base/escape.h" 61 #include "net/base/escape.h"
65 #include "ui/base/l10n/l10n_util.h" 62 #include "ui/base/l10n/l10n_util.h"
66 #include "ui/base/resource/resource_bundle.h" 63 #include "ui/base/resource/resource_bundle.h"
67 #include "ui/base/webui/jstemplate_builder.h" 64 #include "ui/base/webui/jstemplate_builder.h"
68 #include "ui/base/webui/web_ui_util.h" 65 #include "ui/base/webui/web_ui_util.h"
69 #include "url/gurl.h" 66 #include "url/gurl.h"
70 67
68 #if defined(ENABLE_MANAGED_USERS)
69 #include "chrome/browser/ui/webui/options/managed_user_create_confirm_handler.h"
70 #include "chrome/browser/ui/webui/options/managed_user_import_handler.h"
71 #include "chrome/browser/ui/webui/options/managed_user_learn_more_handler.h"
72 #endif
73
71 #if defined(OS_CHROMEOS) 74 #if defined(OS_CHROMEOS)
72 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 75 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
73 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 76 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
74 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 77 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
75 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 78 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
76 #include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h " 79 #include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h "
77 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 80 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
78 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 81 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
79 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h" 82 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h"
80 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 83 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 new MediaDevicesSelectionHandler()); 280 new MediaDevicesSelectionHandler());
278 #if defined(OS_CHROMEOS) 281 #if defined(OS_CHROMEOS)
279 AddOptionsPageUIHandler(localized_strings, 282 AddOptionsPageUIHandler(localized_strings,
280 new chromeos::options::CrosLanguageOptionsHandler()); 283 new chromeos::options::CrosLanguageOptionsHandler());
281 #else 284 #else
282 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 285 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
283 #endif 286 #endif
284 AddOptionsPageUIHandler(localized_strings, 287 AddOptionsPageUIHandler(localized_strings,
285 new LanguageDictionaryOverlayHandler()); 288 new LanguageDictionaryOverlayHandler());
286 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 289 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
290 #if defined(ENABLE_MANAGED_USERS)
287 AddOptionsPageUIHandler(localized_strings, 291 AddOptionsPageUIHandler(localized_strings,
288 new ManagedUserCreateConfirmHandler()); 292 new ManagedUserCreateConfirmHandler());
289 AddOptionsPageUIHandler(localized_strings, new ManagedUserImportHandler()); 293 AddOptionsPageUIHandler(localized_strings, new ManagedUserImportHandler());
290 AddOptionsPageUIHandler(localized_strings, new ManagedUserLearnMoreHandler()); 294 AddOptionsPageUIHandler(localized_strings, new ManagedUserLearnMoreHandler());
295 #endif
291 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 296 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
292 AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler()); 297 AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler());
293 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 298 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
294 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 299 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
295 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 300 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
296 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler( 301 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler(
297 g_browser_process->profile_manager())); 302 g_browser_process->profile_manager()));
298 #if defined(OS_CHROMEOS) 303 #if defined(OS_CHROMEOS)
299 AddOptionsPageUIHandler(localized_strings, 304 AddOptionsPageUIHandler(localized_strings,
300 new chromeos::options::AccountsOptionsHandler()); 305 new chromeos::options::AccountsOptionsHandler());
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 // Add only if handler's service is enabled. 458 // Add only if handler's service is enabled.
454 if (handler->IsEnabled()) { 459 if (handler->IsEnabled()) {
455 // Add handler to the list and also pass the ownership. 460 // Add handler to the list and also pass the ownership.
456 web_ui()->AddMessageHandler(handler.release()); 461 web_ui()->AddMessageHandler(handler.release());
457 handler_raw->GetLocalizedValues(localized_strings); 462 handler_raw->GetLocalizedValues(localized_strings);
458 handlers_.push_back(handler_raw); 463 handlers_.push_back(handler_raw);
459 } 464 }
460 } 465 }
461 466
462 } // namespace options 467 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698