| 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/stats_options_handler.h" | 76 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" |
| 77 #include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h" | 77 #include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h" |
| 78 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" | 78 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" |
| 79 #include "chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_hand
ler.h" | 79 #include "chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_hand
ler.h" |
| 80 #endif | 80 #endif |
| 81 | 81 |
| 82 #if defined(USE_NSS) | 82 #if defined(USE_NSS) |
| 83 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" | 83 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" |
| 84 #endif | 84 #endif |
| 85 | 85 |
| 86 using content::RenderViewHost; |
| 86 using content::UserMetricsAction; | 87 using content::UserMetricsAction; |
| 87 using content::WebContents; | 88 using content::WebContents; |
| 88 using content::WebUIMessageHandler; | 89 using content::WebUIMessageHandler; |
| 89 | 90 |
| 90 static const char kLocalizedStringsFile[] = "strings.js"; | 91 static const char kLocalizedStringsFile[] = "strings.js"; |
| 91 static const char kOptionsBundleJsFile[] = "options_bundle.js"; | 92 static const char kOptionsBundleJsFile[] = "options_bundle.js"; |
| 92 | 93 |
| 93 //////////////////////////////////////////////////////////////////////////////// | 94 //////////////////////////////////////////////////////////////////////////////// |
| 94 // | 95 // |
| 95 // OptionsUIHTMLSource | 96 // OptionsUIHTMLSource |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 #if defined(OS_WIN) | 358 #if defined(OS_WIN) |
| 358 command_line_string = | 359 command_line_string = |
| 359 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); | 360 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); |
| 360 #else | 361 #else |
| 361 command_line_string = | 362 command_line_string = |
| 362 CommandLine::ForCurrentProcess()->GetCommandLineString(); | 363 CommandLine::ForCurrentProcess()->GetCommandLineString(); |
| 363 #endif | 364 #endif |
| 364 | 365 |
| 365 render_view_host->SetWebUIProperty("commandLineString", command_line_string); | 366 render_view_host->SetWebUIProperty("commandLineString", command_line_string); |
| 366 } | 367 } |
| OLD | NEW |