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::WebContents; | 85 using content::WebContents; |
82 using content::WebUIMessageHandler; | 86 using content::WebUIMessageHandler; |
83 | 87 |
84 namespace options2 { | 88 namespace options2 { |
85 | 89 |
86 static const char kLocalizedStringsFile[] = "strings.js"; | 90 static const char kLocalizedStringsFile[] = "strings.js"; |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 localized_strings, | 218 localized_strings, |
215 new chromeos::options2::VirtualKeyboardManagerHandler()); | 219 new chromeos::options2::VirtualKeyboardManagerHandler()); |
216 AddOptionsPageUIHandler(localized_strings, | 220 AddOptionsPageUIHandler(localized_strings, |
217 new chromeos::options2::ProxyHandler()); | 221 new chromeos::options2::ProxyHandler()); |
218 AddOptionsPageUIHandler( | 222 AddOptionsPageUIHandler( |
219 localized_strings, | 223 localized_strings, |
220 new chromeos::options2::ChangePictureOptionsHandler()); | 224 new chromeos::options2::ChangePictureOptionsHandler()); |
221 AddOptionsPageUIHandler(localized_strings, | 225 AddOptionsPageUIHandler(localized_strings, |
222 new chromeos::options2::StatsOptionsHandler()); | 226 new chromeos::options2::StatsOptionsHandler()); |
223 #endif | 227 #endif |
| 228 #if defined(USE_ASH) |
| 229 AddOptionsPageUIHandler( |
| 230 localized_strings, |
| 231 new chromeos::options2::SetWallpaperOptionsHandler()); |
| 232 #endif |
224 #if defined(USE_NSS) | 233 #if defined(USE_NSS) |
225 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler()); | 234 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler()); |
226 #endif | 235 #endif |
227 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); | 236 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); |
228 | 237 |
229 // |localized_strings| ownership is taken over by this constructor. | 238 // |localized_strings| ownership is taken over by this constructor. |
230 OptionsUIHTMLSource* html_source = | 239 OptionsUIHTMLSource* html_source = |
231 new OptionsUIHTMLSource(localized_strings); | 240 new OptionsUIHTMLSource(localized_strings); |
232 | 241 |
233 // Set up the chrome://settings-frame/ source. | 242 // Set up the chrome://settings-frame/ source. |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); | 324 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); |
316 #else | 325 #else |
317 command_line_string = | 326 command_line_string = |
318 CommandLine::ForCurrentProcess()->GetCommandLineString(); | 327 CommandLine::ForCurrentProcess()->GetCommandLineString(); |
319 #endif | 328 #endif |
320 | 329 |
321 render_view_host->SetWebUIProperty("commandLineString", command_line_string); | 330 render_view_host->SetWebUIProperty("commandLineString", command_line_string); |
322 } | 331 } |
323 | 332 |
324 } // namespace options2 | 333 } // namespace options2 |
OLD | NEW |