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

Side by Side Diff: chrome/app/mash/mash_runner.cc

Issue 2646983002: nogncheck an include guarded under OS_CHROMEOS (Closed)
Patch Set: Created 3 years, 11 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/app/mash/mash_runner.h" 5 #include "chrome/app/mash/mash_runner.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base_paths.h" 8 #include "base/base_paths.h"
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "services/service_manager/runner/common/client_util.h" 42 #include "services/service_manager/runner/common/client_util.h"
43 #include "services/service_manager/runner/common/switches.h" 43 #include "services/service_manager/runner/common/switches.h"
44 #include "services/service_manager/runner/init.h" 44 #include "services/service_manager/runner/init.h"
45 #include "ui/base/resource/resource_bundle.h" 45 #include "ui/base/resource/resource_bundle.h"
46 #include "ui/base/ui_base_paths.h" 46 #include "ui/base/ui_base_paths.h"
47 #include "ui/base/ui_base_switches.h" 47 #include "ui/base/ui_base_switches.h"
48 48
49 #if defined(OS_CHROMEOS) 49 #if defined(OS_CHROMEOS)
50 #include "base/debug/leak_annotations.h" 50 #include "base/debug/leak_annotations.h"
51 #include "chrome/app/mash/mash_crash_reporter_client.h" 51 #include "chrome/app/mash/mash_crash_reporter_client.h"
52 #include "components/crash/content/app/breakpad_linux.h" 52 #include "components/crash/content/app/breakpad_linux.h" // nogncheck
53 #endif 53 #endif
54 54
55 using service_manager::mojom::ServiceFactory; 55 using service_manager::mojom::ServiceFactory;
56 56
57 namespace { 57 namespace {
58 58
59 // kProcessType used to identify child processes. 59 // kProcessType used to identify child processes.
60 const char* kMashChild = "mash-child"; 60 const char* kMashChild = "mash-child";
61 61
62 const char kChromeMashServiceName[] = "chrome_mash"; 62 const char kChromeMashServiceName[] = "chrome_mash";
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 command_line->GetSwitchValueASCII(switches::kWaitForDebugger)) { 294 command_line->GetSwitchValueASCII(switches::kWaitForDebugger)) {
295 return; 295 return;
296 } 296 }
297 297
298 // Include the pid as logging may not have been initialized yet (the pid 298 // Include the pid as logging may not have been initialized yet (the pid
299 // printed out by logging is wrong). 299 // printed out by logging is wrong).
300 LOG(WARNING) << "waiting for debugger to attach for service " << service_name 300 LOG(WARNING) << "waiting for debugger to attach for service " << service_name
301 << " pid=" << base::Process::Current().Pid(); 301 << " pid=" << base::Process::Current().Pid();
302 base::debug::WaitForDebugger(120, true); 302 base::debug::WaitForDebugger(120, true);
303 } 303 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698