| 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/options2/options_ui2.h" | 5 #include "chrome/browser/ui/webui/options2/options_ui2.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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h" | 67 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h" |
| 68 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h" | 68 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h" |
| 69 #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h" | 69 #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h" |
| 70 #include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h" | 70 #include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h" |
| 71 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h" | 71 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h" |
| 72 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h" | 72 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h" |
| 73 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h" | 73 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h" |
| 74 #include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_han
dler2.h" | 74 #include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_han
dler2.h" |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 #if defined(USE_ASH) |
| 78 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle
r2.h" |
| 79 #endif |
| 80 |
| 77 #if defined(USE_NSS) | 81 #if defined(USE_NSS) |
| 78 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" | 82 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" |
| 79 #endif | 83 #endif |
| 80 | 84 |
| 81 using content::RenderViewHost; | 85 using content::RenderViewHost; |
| 82 using content::WebContents; | 86 using content::WebContents; |
| 83 using content::WebUIMessageHandler; | 87 using content::WebUIMessageHandler; |
| 84 | 88 |
| 85 namespace options2 { | 89 namespace options2 { |
| 86 | 90 |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 localized_strings, | 219 localized_strings, |
| 216 new chromeos::options2::VirtualKeyboardManagerHandler()); | 220 new chromeos::options2::VirtualKeyboardManagerHandler()); |
| 217 AddOptionsPageUIHandler(localized_strings, | 221 AddOptionsPageUIHandler(localized_strings, |
| 218 new chromeos::options2::ProxyHandler()); | 222 new chromeos::options2::ProxyHandler()); |
| 219 AddOptionsPageUIHandler( | 223 AddOptionsPageUIHandler( |
| 220 localized_strings, | 224 localized_strings, |
| 221 new chromeos::options2::ChangePictureOptionsHandler()); | 225 new chromeos::options2::ChangePictureOptionsHandler()); |
| 222 AddOptionsPageUIHandler(localized_strings, | 226 AddOptionsPageUIHandler(localized_strings, |
| 223 new chromeos::options2::StatsOptionsHandler()); | 227 new chromeos::options2::StatsOptionsHandler()); |
| 224 #endif | 228 #endif |
| 229 #if defined(USE_ASH) |
| 230 AddOptionsPageUIHandler( |
| 231 localized_strings, |
| 232 new chromeos::options2::SetWallpaperOptionsHandler()); |
| 233 #endif |
| 225 #if defined(USE_NSS) | 234 #if defined(USE_NSS) |
| 226 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler()); | 235 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler()); |
| 227 #endif | 236 #endif |
| 228 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); | 237 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); |
| 229 | 238 |
| 230 // |localized_strings| ownership is taken over by this constructor. | 239 // |localized_strings| ownership is taken over by this constructor. |
| 231 OptionsUIHTMLSource* html_source = | 240 OptionsUIHTMLSource* html_source = |
| 232 new OptionsUIHTMLSource(localized_strings); | 241 new OptionsUIHTMLSource(localized_strings); |
| 233 | 242 |
| 234 // Set up the chrome://settings-frame/ source. | 243 // Set up the chrome://settings-frame/ source. |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); | 325 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); |
| 317 #else | 326 #else |
| 318 command_line_string = | 327 command_line_string = |
| 319 CommandLine::ForCurrentProcess()->GetCommandLineString(); | 328 CommandLine::ForCurrentProcess()->GetCommandLineString(); |
| 320 #endif | 329 #endif |
| 321 | 330 |
| 322 render_view_host->SetWebUIProperty("commandLineString", command_line_string); | 331 render_view_host->SetWebUIProperty("commandLineString", command_line_string); |
| 323 } | 332 } |
| 324 | 333 |
| 325 } // namespace options2 | 334 } // namespace options2 |
| OLD | NEW |