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