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

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

Issue 2229273003: services: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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 | « no previous file | services/ui/ws/modal_window_controller.cc » ('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/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"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } else { 53 } else {
54 base::FilePath exe_path = 54 base::FilePath exe_path =
55 command_line->GetProgram().BaseName().RemoveExtension(); 55 command_line->GetProgram().BaseName().RemoveExtension();
56 for (const auto& app_name : apps_to_debug) { 56 for (const auto& app_name : apps_to_debug) {
57 if (base::FilePath().AppendASCII(app_name) == exe_path) { 57 if (base::FilePath().AppendASCII(app_name) == exe_path) {
58 app = app_name; 58 app = app_name;
59 break; 59 break;
60 } 60 }
61 } 61 }
62 } 62 }
63 if (apps_to_debug.empty() || ContainsValue(apps_to_debug, app)) { 63 if (apps_to_debug.empty() || base::ContainsValue(apps_to_debug, app)) {
64 #if defined(OS_WIN) 64 #if defined(OS_WIN)
65 base::string16 appw = base::UTF8ToUTF16(app); 65 base::string16 appw = base::UTF8ToUTF16(app);
66 base::string16 message = base::UTF8ToUTF16( 66 base::string16 message = base::UTF8ToUTF16(
67 base::StringPrintf("%s - %d", app.c_str(), GetCurrentProcessId())); 67 base::StringPrintf("%s - %d", app.c_str(), GetCurrentProcessId()));
68 MessageBox(NULL, message.c_str(), appw.c_str(), MB_OK | MB_SETFOREGROUND); 68 MessageBox(NULL, message.c_str(), appw.c_str(), MB_OK | MB_SETFOREGROUND);
69 #else 69 #else
70 LOG(ERROR) << app << " waiting for GDB. pid: " << getpid(); 70 LOG(ERROR) << app << " waiting for GDB. pid: " << getpid();
71 base::debug::WaitForDebugger(60, true); 71 base::debug::WaitForDebugger(60, true);
72 #endif 72 #endif
73 } 73 }
(...skipping 14 matching lines...) Expand all
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 | « no previous file | services/ui/ws/modal_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698