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" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/memory/ref_counted_memory.h" |
12 #include "base/memory/singleton.h" | 13 #include "base/memory/singleton.h" |
13 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
14 #include "base/string_piece.h" | 15 #include "base/string_piece.h" |
15 #include "base/string_util.h" | 16 #include "base/string_util.h" |
16 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
17 #include "base/time.h" | 18 #include "base/time.h" |
18 #include "base/values.h" | 19 #include "base/values.h" |
19 #include "chrome/browser/autocomplete/autocomplete.h" | 20 #include "chrome/browser/autocomplete/autocomplete.h" |
20 #include "chrome/browser/autocomplete/autocomplete_match.h" | 21 #include "chrome/browser/autocomplete/autocomplete_match.h" |
21 #include "chrome/browser/browser_about_handler.h" | 22 #include "chrome/browser/browser_about_handler.h" |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); | 420 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); |
420 #else | 421 #else |
421 command_line_string = | 422 command_line_string = |
422 CommandLine::ForCurrentProcess()->GetCommandLineString(); | 423 CommandLine::ForCurrentProcess()->GetCommandLineString(); |
423 #endif | 424 #endif |
424 | 425 |
425 render_view_host->SetWebUIProperty("commandLineString", command_line_string); | 426 render_view_host->SetWebUIProperty("commandLineString", command_line_string); |
426 } | 427 } |
427 | 428 |
428 } // namespace options2 | 429 } // namespace options2 |
OLD | NEW |