Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: services/service_manager/runner/init.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/service_manager/runner/init.h ('k') | services/service_manager/service_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/service_manager/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/service_manager/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 shell { 27 namespace shell {
28 28
29 void InitializeLogging() { 29 void InitializeLogging() {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // the copy of icu in the mojo binary that we're running. 88 // the copy of icu in the mojo binary that we're running.
89 const uint8_t* icu_data = base::i18n::GetRawIcuMemory(); 89 const uint8_t* icu_data = base::i18n::GetRawIcuMemory();
90 init_function(icu_data); 90 init_function(icu_data);
91 #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE 91 #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
92 92
93 // TODO(erg): All chromium binaries load base. We might want to make a 93 // TODO(erg): All chromium binaries load base. We might want to make a
94 // general system for other people. 94 // general system for other people.
95 } 95 }
96 96
97 } // namespace shell 97 } // namespace shell
OLDNEW
« no previous file with comments | « services/service_manager/runner/init.h ('k') | services/service_manager/service_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698