OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "services/shell/runner/init.h" | 5 #include "services/shell/runner/init.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/debug/debugger.h" | 11 #include "base/debug/debugger.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/i18n/icu_util.h" | 13 #include "base/i18n/icu_util.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
16 #include "base/strings/string_split.h" | 16 #include "base/strings/string_split.h" |
17 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
18 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
19 #include "services/shell/runner/common/switches.h" | 19 #include "services/shell/runner/common/switches.h" |
20 | 20 |
21 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
22 #include <windows.h> | 22 #include <windows.h> |
23 #elif (OS_POSIX) | 23 #elif (OS_POSIX) |
24 #include <unistd.h> | 24 #include <unistd.h> |
25 #endif | 25 #endif |
26 | 26 |
27 namespace mojo { | |
28 namespace shell { | 27 namespace shell { |
29 | 28 |
30 void InitializeLogging() { | 29 void InitializeLogging() { |
31 logging::LoggingSettings settings; | 30 logging::LoggingSettings settings; |
32 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 31 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
33 logging::InitLogging(settings); | 32 logging::InitLogging(settings); |
34 // To view log output with IDs and timestamps use "adb logcat -v threadtime". | 33 // To view log output with IDs and timestamps use "adb logcat -v threadtime". |
35 logging::SetLogItems(true, // Process ID | 34 logging::SetLogItems(true, // Process ID |
36 true, // Thread ID | 35 true, // Thread ID |
37 true, // Timestamp | 36 true, // Timestamp |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 // the copy of icu in the mojo binary that we're running. | 77 // the copy of icu in the mojo binary that we're running. |
79 const uint8_t* icu_data = base::i18n::GetRawIcuMemory(); | 78 const uint8_t* icu_data = base::i18n::GetRawIcuMemory(); |
80 init_function(icu_data); | 79 init_function(icu_data); |
81 } | 80 } |
82 | 81 |
83 // TODO(erg): All chromium binaries load base. We might want to make a | 82 // TODO(erg): All chromium binaries load base. We might want to make a |
84 // general system for other people. | 83 // general system for other people. |
85 } | 84 } |
86 | 85 |
87 } // namespace shell | 86 } // namespace shell |
88 } // namespace mojo | |
OLD | NEW |