diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 04:07:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 04:07:50 +0000 |
| commit | 58580359a452cb7c3b9580edc0843c3ab3d158df (patch) | |
| tree | 964dbcc1505f4b9c2bbb5e7a64720861d604c8f3 /chrome/app | |
| parent | 23872906817de5d402b0c2da6d5f7ee6026378e6 (diff) | |
| download | chromium_src-58580359a452cb7c3b9580edc0843c3ab3d158df.zip chromium_src-58580359a452cb7c3b9580edc0843c3ab3d158df.tar.gz chromium_src-58580359a452cb7c3b9580edc0843c3ab3d158df.tar.bz2 | |
Move debug-related stuff from base to the base/debug directory and use the
base::debug namespace.
This splits apart debug_util into base/debugger and base/stack_trace
There are still two functions in debug_util that I'm not sure what to do with.
Since this uses the base::debug namespace, I removed the functions in
debugger.h from the static class and just made them free functions in the
namespace.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3945002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 8 | ||||
| -rw-r--r-- | chrome/app/client_util.cc | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 0d59516..a3923b4 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -38,6 +38,7 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/debug_util.h" +#include "base/debug/debugger.h" #include "base/i18n/icu_util.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/message_loop.h" @@ -627,9 +628,10 @@ int ChromeMain(int argc, char** argv) { // console) but doesn't for the child processes, killing them. // The fix is to have child processes ignore SIGINT; they'll die // on their own when the browser process goes away. - // Note that we *can't* rely on DebugUtil::BeingDebugged to catch this - // case because we are the child process, which is not being debugged. - if (!DebugUtil::BeingDebugged()) + // + // Note that we *can't* rely on BeingDebugged to catch this case because we + // are the child process, which is not being debugged. + if (!base::debug::BeingDebugged()) signal(SIGINT, SIG_IGN); #endif } diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 61d8c40..1741cb6 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -6,9 +6,9 @@ #include <shlwapi.h> #include "base/command_line.h" +#include "base/debug/trace_event.h" #include "base/environment.h" #include "base/file_util.h" -#include "base/trace_event.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" |