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

Side by Side Diff: chrome/browser/ui/webui/options/options_ui.cc

Issue 384023002: Rename "managed (mode|user)" to "supervised user" (part 6) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: break long lines 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 | Annotate | Revision Log
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"
47 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler .h"
48 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h"
49 #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h"
50 #include "chrome/browser/ui/webui/sync_setup_handler.h" 50 #include "chrome/browser/ui/webui/sync_setup_handler.h"
51 #include "chrome/browser/ui/webui/theme_source.h" 51 #include "chrome/browser/ui/webui/theme_source.h"
52 #include "chrome/common/url_constants.h" 52 #include "chrome/common/url_constants.h"
53 #include "content/public/browser/notification_types.h" 53 #include "content/public/browser/notification_types.h"
54 #include "content/public/browser/render_frame_host.h" 54 #include "content/public/browser/render_frame_host.h"
55 #include "content/public/browser/url_data_source.h" 55 #include "content/public/browser/url_data_source.h"
56 #include "content/public/browser/web_contents.h" 56 #include "content/public/browser/web_contents.h"
57 #include "content/public/browser/web_contents_delegate.h" 57 #include "content/public/browser/web_contents_delegate.h"
58 #include "content/public/browser/web_ui.h" 58 #include "content/public/browser/web_ui.h"
59 #include "grit/chromium_strings.h" 59 #include "grit/chromium_strings.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 new MediaDevicesSelectionHandler()); 277 new MediaDevicesSelectionHandler());
278 #if defined(OS_CHROMEOS) 278 #if defined(OS_CHROMEOS)
279 AddOptionsPageUIHandler(localized_strings, 279 AddOptionsPageUIHandler(localized_strings,
280 new chromeos::options::CrosLanguageOptionsHandler()); 280 new chromeos::options::CrosLanguageOptionsHandler());
281 #else 281 #else
282 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 282 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
283 #endif 283 #endif
284 AddOptionsPageUIHandler(localized_strings, 284 AddOptionsPageUIHandler(localized_strings,
285 new LanguageDictionaryOverlayHandler()); 285 new LanguageDictionaryOverlayHandler());
286 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 286 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
287 AddOptionsPageUIHandler(localized_strings,
288 new ManagedUserCreateConfirmHandler());
289 AddOptionsPageUIHandler(localized_strings, new ManagedUserImportHandler());
290 AddOptionsPageUIHandler(localized_strings, new ManagedUserLearnMoreHandler());
291 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 287 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
292 AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler()); 288 AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler());
293 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 289 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
294 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 290 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
295 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 291 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
292 AddOptionsPageUIHandler(localized_strings,
293 new SupervisedUserCreateConfirmHandler());
294 AddOptionsPageUIHandler(localized_strings, new SupervisedUserImportHandler());
295 AddOptionsPageUIHandler(localized_strings,
296 new SupervisedUserLearnMoreHandler());
296 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler( 297 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler(
297 g_browser_process->profile_manager())); 298 g_browser_process->profile_manager()));
298 #if defined(OS_CHROMEOS) 299 #if defined(OS_CHROMEOS)
299 AddOptionsPageUIHandler(localized_strings, 300 AddOptionsPageUIHandler(localized_strings,
300 new chromeos::options::AccountsOptionsHandler()); 301 new chromeos::options::AccountsOptionsHandler());
301 AddOptionsPageUIHandler(localized_strings, 302 AddOptionsPageUIHandler(localized_strings,
302 new chromeos::options::BluetoothOptionsHandler()); 303 new chromeos::options::BluetoothOptionsHandler());
303 AddOptionsPageUIHandler(localized_strings, 304 AddOptionsPageUIHandler(localized_strings,
304 new chromeos::options::ConsumerManagementHandler()); 305 new chromeos::options::ConsumerManagementHandler());
305 AddOptionsPageUIHandler(localized_strings, 306 AddOptionsPageUIHandler(localized_strings,
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 // Add only if handler's service is enabled. 454 // Add only if handler's service is enabled.
454 if (handler->IsEnabled()) { 455 if (handler->IsEnabled()) {
455 // Add handler to the list and also pass the ownership. 456 // Add handler to the list and also pass the ownership.
456 web_ui()->AddMessageHandler(handler.release()); 457 web_ui()->AddMessageHandler(handler.release());
457 handler_raw->GetLocalizedValues(localized_strings); 458 handler_raw->GetLocalizedValues(localized_strings);
458 handlers_.push_back(handler_raw); 459 handlers_.push_back(handler_raw);
459 } 460 }
460 } 461 }
461 462
462 } // namespace options 463 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698