| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 AddOptionsPageUIHandler(localized_strings, | 242 AddOptionsPageUIHandler(localized_strings, |
| 243 new chromeos::LanguageCustomizeModifierKeysHandler()); | 243 new chromeos::LanguageCustomizeModifierKeysHandler()); |
| 244 AddOptionsPageUIHandler(localized_strings, | 244 AddOptionsPageUIHandler(localized_strings, |
| 245 new chromeos::LanguageHangulHandler()); | 245 new chromeos::LanguageHangulHandler()); |
| 246 AddOptionsPageUIHandler(localized_strings, | 246 AddOptionsPageUIHandler(localized_strings, |
| 247 new chromeos::LanguageMozcHandler()); | 247 new chromeos::LanguageMozcHandler()); |
| 248 AddOptionsPageUIHandler(localized_strings, | 248 AddOptionsPageUIHandler(localized_strings, |
| 249 new chromeos::LanguagePinyinHandler()); | 249 new chromeos::LanguagePinyinHandler()); |
| 250 AddOptionsPageUIHandler(localized_strings, | 250 AddOptionsPageUIHandler(localized_strings, |
| 251 new chromeos::VirtualKeyboardManagerHandler()); | 251 new chromeos::VirtualKeyboardManagerHandler()); |
| 252 AddOptionsPageUIHandler(localized_strings, new chromeos::ProxyHandler()); | 252 AddOptionsPageUIHandler(localized_strings, |
| 253 new chromeos::ProxyHandler(GetProfile())); |
| 253 AddOptionsPageUIHandler(localized_strings, | 254 AddOptionsPageUIHandler(localized_strings, |
| 254 new chromeos::ChangePictureOptionsHandler()); | 255 new chromeos::ChangePictureOptionsHandler()); |
| 255 AddOptionsPageUIHandler(localized_strings, | 256 AddOptionsPageUIHandler(localized_strings, |
| 256 new chromeos::StatsOptionsHandler()); | 257 new chromeos::StatsOptionsHandler()); |
| 257 AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler()); | 258 AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler()); |
| 258 #endif | 259 #endif |
| 259 #if defined(USE_NSS) | 260 #if defined(USE_NSS) |
| 260 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler()); | 261 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler()); |
| 261 #endif | 262 #endif |
| 262 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); | 263 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 OptionsPageUIHandler* handler_raw) { | 348 OptionsPageUIHandler* handler_raw) { |
| 348 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); | 349 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); |
| 349 DCHECK(handler.get()); | 350 DCHECK(handler.get()); |
| 350 // Add only if handler's service is enabled. | 351 // Add only if handler's service is enabled. |
| 351 if (handler->IsEnabled()) { | 352 if (handler->IsEnabled()) { |
| 352 handler->GetLocalizedValues(localized_strings); | 353 handler->GetLocalizedValues(localized_strings); |
| 353 // Add handler to the list and also pass the ownership. | 354 // Add handler to the list and also pass the ownership. |
| 354 AddMessageHandler(handler.release()->Attach(this)); | 355 AddMessageHandler(handler.release()->Attach(this)); |
| 355 } | 356 } |
| 356 } | 357 } |
| OLD | NEW |