| OLD | NEW |
| 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 <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 | 74 |
| 75 #if defined(ENABLE_SUPERVISED_USERS) | 75 #if defined(ENABLE_SUPERVISED_USERS) |
| 76 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler
.h" | 76 #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler
.h" |
| 77 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h" | 77 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h" |
| 78 #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h" | 78 #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h" |
| 79 #endif | 79 #endif |
| 80 | 80 |
| 81 #if defined(OS_CHROMEOS) | 81 #if defined(OS_CHROMEOS) |
| 82 #include "chrome/browser/browser_process_platform_part.h" | 82 #include "chrome/browser/browser_process_platform_part.h" |
| 83 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 83 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 84 #include "chrome/browser/chromeos/policy/consumer_management_service.h" | |
| 85 #include "chrome/browser/chromeos/system/pointer_device_observer.h" | 84 #include "chrome/browser/chromeos/system/pointer_device_observer.h" |
| 86 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" | 85 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" |
| 87 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" | 86 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" |
| 88 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle
r.h" | 87 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle
r.h" |
| 89 #include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h
" | |
| 90 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler
.h" | 88 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler
.h" |
| 91 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler
.h" | 89 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler
.h" |
| 92 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h" | 90 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h" |
| 93 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" | 91 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" |
| 94 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" | 92 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" |
| 95 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" | 93 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" |
| 96 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" | 94 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" |
| 97 #include "chrome/browser/ui/webui/options/chromeos/options_note_handler.h" | 95 #include "chrome/browser/ui/webui/options/chromeos/options_note_handler.h" |
| 98 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" | 96 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" |
| 99 #include "chrome/browser/ui/webui/options/chromeos/power_handler.h" | 97 #include "chrome/browser/ui/webui/options/chromeos/power_handler.h" |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 | 334 |
| 337 AddOptionsPageUIHandler(localized_strings, | 335 AddOptionsPageUIHandler(localized_strings, |
| 338 new chromeos::options::ProxyHandler()); | 336 new chromeos::options::ProxyHandler()); |
| 339 AddOptionsPageUIHandler( | 337 AddOptionsPageUIHandler( |
| 340 localized_strings, | 338 localized_strings, |
| 341 new chromeos::options::ChangePictureOptionsHandler()); | 339 new chromeos::options::ChangePictureOptionsHandler()); |
| 342 AddOptionsPageUIHandler(localized_strings, | 340 AddOptionsPageUIHandler(localized_strings, |
| 343 new chromeos::options::StatsOptionsHandler()); | 341 new chromeos::options::StatsOptionsHandler()); |
| 344 AddOptionsPageUIHandler(localized_strings, | 342 AddOptionsPageUIHandler(localized_strings, |
| 345 new chromeos::options::StorageManagerHandler()); | 343 new chromeos::options::StorageManagerHandler()); |
| 346 | |
| 347 policy::ConsumerManagementService* consumer_management = | |
| 348 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> | |
| 349 GetConsumerManagementService(); | |
| 350 chromeos::options::ConsumerManagementHandler* consumer_management_handler = | |
| 351 new chromeos::options::ConsumerManagementHandler(consumer_management); | |
| 352 AddOptionsPageUIHandler(localized_strings, consumer_management_handler); | |
| 353 #endif | 344 #endif |
| 354 #if defined(USE_NSS_CERTS) | 345 #if defined(USE_NSS_CERTS) |
| 355 AddOptionsPageUIHandler(localized_strings, | 346 AddOptionsPageUIHandler(localized_strings, |
| 356 new CertificateManagerHandler(false)); | 347 new CertificateManagerHandler(false)); |
| 357 #endif | 348 #endif |
| 358 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); | 349 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); |
| 359 | 350 |
| 360 web_ui->AddMessageHandler(new MetricsHandler()); | 351 web_ui->AddMessageHandler(new MetricsHandler()); |
| 361 | 352 |
| 362 // Enable extension API calls in the WebUI. | 353 // Enable extension API calls in the WebUI. |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 // Add only if handler's service is enabled. | 478 // Add only if handler's service is enabled. |
| 488 if (handler->IsEnabled()) { | 479 if (handler->IsEnabled()) { |
| 489 // Add handler to the list and also pass the ownership. | 480 // Add handler to the list and also pass the ownership. |
| 490 web_ui()->AddMessageHandler(handler.release()); | 481 web_ui()->AddMessageHandler(handler.release()); |
| 491 handler_raw->GetLocalizedValues(localized_strings); | 482 handler_raw->GetLocalizedValues(localized_strings); |
| 492 handlers_.push_back(handler_raw); | 483 handlers_.push_back(handler_raw); |
| 493 } | 484 } |
| 494 } | 485 } |
| 495 | 486 |
| 496 } // namespace options | 487 } // namespace options |
| OLD | NEW |