| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_NSS) | 77 #if defined(USE_NSS) |
| 78 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" | 78 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" |
| 79 #endif | 79 #endif |
| 80 | 80 |
| 81 using content::RenderViewHost; |
| 81 using content::WebContents; | 82 using content::WebContents; |
| 82 using content::WebUIMessageHandler; | 83 using content::WebUIMessageHandler; |
| 83 | 84 |
| 84 namespace options2 { | 85 namespace options2 { |
| 85 | 86 |
| 86 static const char kLocalizedStringsFile[] = "strings.js"; | 87 static const char kLocalizedStringsFile[] = "strings.js"; |
| 87 static const char kOptionsBundleJsFile[] = "options_bundle.js"; | 88 static const char kOptionsBundleJsFile[] = "options_bundle.js"; |
| 88 | 89 |
| 89 //////////////////////////////////////////////////////////////////////////////// | 90 //////////////////////////////////////////////////////////////////////////////// |
| 90 // | 91 // |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); | 316 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); |
| 316 #else | 317 #else |
| 317 command_line_string = | 318 command_line_string = |
| 318 CommandLine::ForCurrentProcess()->GetCommandLineString(); | 319 CommandLine::ForCurrentProcess()->GetCommandLineString(); |
| 319 #endif | 320 #endif |
| 320 | 321 |
| 321 render_view_host->SetWebUIProperty("commandLineString", command_line_string); | 322 render_view_host->SetWebUIProperty("commandLineString", command_line_string); |
| 322 } | 323 } |
| 323 | 324 |
| 324 } // namespace options2 | 325 } // namespace options2 |
| OLD | NEW |