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

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

Issue 12208068: Add a set passphrase dialog for managed user accounts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error on linux_clang. Created 7 years, 10 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/callback.h" 10 #include "base/callback.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/ui/webui/options/content_settings_handler.h" 28 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
29 #include "chrome/browser/ui/webui/options/cookies_view_handler.h" 29 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
30 #include "chrome/browser/ui/webui/options/core_options_handler.h" 30 #include "chrome/browser/ui/webui/options/core_options_handler.h"
31 #include "chrome/browser/ui/webui/options/font_settings_handler.h" 31 #include "chrome/browser/ui/webui/options/font_settings_handler.h"
32 #include "chrome/browser/ui/webui/options/handler_options_handler.h" 32 #include "chrome/browser/ui/webui/options/handler_options_handler.h"
33 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h" 33 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h"
34 #include "chrome/browser/ui/webui/options/import_data_handler.h" 34 #include "chrome/browser/ui/webui/options/import_data_handler.h"
35 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h" 35 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h"
36 #include "chrome/browser/ui/webui/options/language_options_handler.h" 36 #include "chrome/browser/ui/webui/options/language_options_handler.h"
37 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" 37 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
38 #include "chrome/browser/ui/webui/options/managed_user_passphrase_handler.h"
38 #include "chrome/browser/ui/webui/options/managed_user_settings_handler.h" 39 #include "chrome/browser/ui/webui/options/managed_user_settings_handler.h"
39 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" 40 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
40 #include "chrome/browser/ui/webui/options/media_galleries_handler.h" 41 #include "chrome/browser/ui/webui/options/media_galleries_handler.h"
41 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" 42 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
42 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 43 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
43 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 44 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
44 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 45 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
45 #include "chrome/browser/ui/webui/theme_source.h" 46 #include "chrome/browser/ui/webui/theme_source.h"
46 #include "chrome/common/time_format.h" 47 #include "chrome/common/time_format.h"
47 #include "chrome/common/url_constants.h" 48 #include "chrome/common/url_constants.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 AddOptionsPageUIHandler(localized_strings, new MediaGalleriesHandler()); 259 AddOptionsPageUIHandler(localized_strings, new MediaGalleriesHandler());
259 #if defined(OS_CHROMEOS) 260 #if defined(OS_CHROMEOS)
260 AddOptionsPageUIHandler(localized_strings, 261 AddOptionsPageUIHandler(localized_strings,
261 new chromeos::options::CrosLanguageOptionsHandler()); 262 new chromeos::options::CrosLanguageOptionsHandler());
262 #else 263 #else
263 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 264 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
264 #endif 265 #endif
265 AddOptionsPageUIHandler(localized_strings, 266 AddOptionsPageUIHandler(localized_strings,
266 new LanguageDictionaryOverlayHandler()); 267 new LanguageDictionaryOverlayHandler());
267 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 268 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
269 AddOptionsPageUIHandler(localized_strings,
270 new ManagedUserPassphraseHandler());
268 AddOptionsPageUIHandler(localized_strings, new ManagedUserSettingsHandler()); 271 AddOptionsPageUIHandler(localized_strings, new ManagedUserSettingsHandler());
269 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 272 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
270 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 273 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
271 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 274 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
272 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 275 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
273 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( 276 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
274 g_browser_process->profile_manager())); 277 g_browser_process->profile_manager()));
275 #if defined(OS_CHROMEOS) 278 #if defined(OS_CHROMEOS)
276 AddOptionsPageUIHandler(localized_strings, 279 AddOptionsPageUIHandler(localized_strings,
277 new chromeos::options::AccountsOptionsHandler()); 280 new chromeos::options::AccountsOptionsHandler());
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 // Add only if handler's service is enabled. 420 // Add only if handler's service is enabled.
418 if (handler->IsEnabled()) { 421 if (handler->IsEnabled()) {
419 // Add handler to the list and also pass the ownership. 422 // Add handler to the list and also pass the ownership.
420 web_ui()->AddMessageHandler(handler.release()); 423 web_ui()->AddMessageHandler(handler.release());
421 handler_raw->GetLocalizedValues(localized_strings); 424 handler_raw->GetLocalizedValues(localized_strings);
422 handlers_.push_back(handler_raw); 425 handlers_.push_back(handler_raw);
423 } 426 }
424 } 427 }
425 428
426 } // namespace options 429 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/managed_user_set_passphrase_test.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698