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 <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler
.h" | 82 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler
.h" |
83 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h" | 83 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h" |
84 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" | 84 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" |
85 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" | 85 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" |
86 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" | 86 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" |
87 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" | 87 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" |
88 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" | 88 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" |
89 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" | 89 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" |
90 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" | 90 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" |
91 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" | 91 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" |
| 92 #include "chrome/browser/ui/webui/options/help_overlay_handler.h" |
92 #endif | 93 #endif |
93 | 94 |
94 #if defined(USE_NSS) | 95 #if defined(USE_NSS) |
95 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" | 96 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" |
96 #endif | 97 #endif |
97 | 98 |
98 #if defined(ENABLE_GOOGLE_NOW) | 99 #if defined(ENABLE_GOOGLE_NOW) |
99 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h" | 100 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h" |
100 #endif | 101 #endif |
101 | 102 |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 AddOptionsPageUIHandler(localized_strings, | 308 AddOptionsPageUIHandler(localized_strings, |
308 new chromeos::options::BluetoothOptionsHandler()); | 309 new chromeos::options::BluetoothOptionsHandler()); |
309 AddOptionsPageUIHandler(localized_strings, | 310 AddOptionsPageUIHandler(localized_strings, |
310 new chromeos::options::DateTimeOptionsHandler()); | 311 new chromeos::options::DateTimeOptionsHandler()); |
311 AddOptionsPageUIHandler(localized_strings, | 312 AddOptionsPageUIHandler(localized_strings, |
312 new chromeos::options::DisplayOptionsHandler()); | 313 new chromeos::options::DisplayOptionsHandler()); |
313 AddOptionsPageUIHandler(localized_strings, | 314 AddOptionsPageUIHandler(localized_strings, |
314 new chromeos::options::DisplayOverscanHandler()); | 315 new chromeos::options::DisplayOverscanHandler()); |
315 AddOptionsPageUIHandler(localized_strings, | 316 AddOptionsPageUIHandler(localized_strings, |
316 new chromeos::options::InternetOptionsHandler()); | 317 new chromeos::options::InternetOptionsHandler()); |
| 318 AddOptionsPageUIHandler(localized_strings, new options::HelpOverlayHandler()); |
317 AddOptionsPageUIHandler(localized_strings, | 319 AddOptionsPageUIHandler(localized_strings, |
318 new chromeos::options::KeyboardHandler()); | 320 new chromeos::options::KeyboardHandler()); |
319 | 321 |
320 chromeos::options::PointerHandler* pointer_handler = | 322 chromeos::options::PointerHandler* pointer_handler = |
321 new chromeos::options::PointerHandler(); | 323 new chromeos::options::PointerHandler(); |
322 AddOptionsPageUIHandler(localized_strings, pointer_handler); | 324 AddOptionsPageUIHandler(localized_strings, pointer_handler); |
323 | 325 |
324 AddOptionsPageUIHandler(localized_strings, | 326 AddOptionsPageUIHandler(localized_strings, |
325 new chromeos::options::ProxyHandler()); | 327 new chromeos::options::ProxyHandler()); |
326 AddOptionsPageUIHandler( | 328 AddOptionsPageUIHandler( |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
464 // Add only if handler's service is enabled. | 466 // Add only if handler's service is enabled. |
465 if (handler->IsEnabled()) { | 467 if (handler->IsEnabled()) { |
466 // Add handler to the list and also pass the ownership. | 468 // Add handler to the list and also pass the ownership. |
467 web_ui()->AddMessageHandler(handler.release()); | 469 web_ui()->AddMessageHandler(handler.release()); |
468 handler_raw->GetLocalizedValues(localized_strings); | 470 handler_raw->GetLocalizedValues(localized_strings); |
469 handlers_.push_back(handler_raw); | 471 handlers_.push_back(handler_raw); |
470 } | 472 } |
471 } | 473 } |
472 | 474 |
473 } // namespace options | 475 } // namespace options |
OLD | NEW |