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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h" | 76 #include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h" |
77 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" | 77 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" |
78 #include "chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_hand
ler.h" | 78 #include "chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_hand
ler.h" |
79 #endif | 79 #endif |
80 | 80 |
81 #if defined(USE_NSS) | 81 #if defined(USE_NSS) |
82 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" | 82 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" |
83 #endif | 83 #endif |
84 | 84 |
85 using content::UserMetricsAction; | 85 using content::UserMetricsAction; |
| 86 using content::WebContents; |
86 | 87 |
87 static const char kLocalizedStringsFile[] = "strings.js"; | 88 static const char kLocalizedStringsFile[] = "strings.js"; |
88 static const char kOptionsBundleJsFile[] = "options_bundle.js"; | 89 static const char kOptionsBundleJsFile[] = "options_bundle.js"; |
89 | 90 |
90 //////////////////////////////////////////////////////////////////////////////// | 91 //////////////////////////////////////////////////////////////////////////////// |
91 // | 92 // |
92 // OptionsUIHTMLSource | 93 // OptionsUIHTMLSource |
93 // | 94 // |
94 //////////////////////////////////////////////////////////////////////////////// | 95 //////////////////////////////////////////////////////////////////////////////// |
95 | 96 |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE), | 190 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE), |
190 l10n_util::GetStringUTF16(title_id))); | 191 l10n_util::GetStringUTF16(title_id))); |
191 } | 192 } |
192 | 193 |
193 //////////////////////////////////////////////////////////////////////////////// | 194 //////////////////////////////////////////////////////////////////////////////// |
194 // | 195 // |
195 // OptionsUI | 196 // OptionsUI |
196 // | 197 // |
197 //////////////////////////////////////////////////////////////////////////////// | 198 //////////////////////////////////////////////////////////////////////////////// |
198 | 199 |
199 OptionsUI::OptionsUI(TabContents* contents) | 200 OptionsUI::OptionsUI(WebContents* contents) |
200 : ChromeWebUI(contents), | 201 : ChromeWebUI(contents), |
201 initialized_handlers_(false) { | 202 initialized_handlers_(false) { |
202 DictionaryValue* localized_strings = new DictionaryValue(); | 203 DictionaryValue* localized_strings = new DictionaryValue(); |
203 | 204 |
204 CoreOptionsHandler* core_handler; | 205 CoreOptionsHandler* core_handler; |
205 #if defined(OS_CHROMEOS) | 206 #if defined(OS_CHROMEOS) |
206 core_handler = new chromeos::CoreChromeOSOptionsHandler(); | 207 core_handler = new chromeos::CoreChromeOSOptionsHandler(); |
207 #else | 208 #else |
208 core_handler = new CoreOptionsHandler(); | 209 core_handler = new CoreOptionsHandler(); |
209 #endif | 210 #endif |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 #if defined(OS_WIN) | 363 #if defined(OS_WIN) |
363 command_line_string = | 364 command_line_string = |
364 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); | 365 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); |
365 #else | 366 #else |
366 command_line_string = | 367 command_line_string = |
367 CommandLine::ForCurrentProcess()->GetCommandLineString(); | 368 CommandLine::ForCurrentProcess()->GetCommandLineString(); |
368 #endif | 369 #endif |
369 | 370 |
370 render_view_host->SetWebUIProperty("commandLineString", command_line_string); | 371 render_view_host->SetWebUIProperty("commandLineString", command_line_string); |
371 } | 372 } |
OLD | NEW |