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 /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 'app')
-rw-r--r-- | app/resource_bundle_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index 369ee40..fbc40b4 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -10,6 +10,7 @@ #include "app/l10n_util.h" #include "base/data_pack.h" #include "base/debug_util.h" +#include "base/debug/stack_trace.h" #include "base/file_util.h" #include "base/lock.h" #include "base/logging.h" @@ -139,7 +140,7 @@ string16 ResourceBundle::GetLocalizedString(int message_id) { // If for some reason we were unable to load a resource dll, return an empty // string (better than crashing). if (!locale_resources_data_) { - StackTrace().PrintBacktrace(); // See http://crbug.com/21925. + base::debug::StackTrace().PrintBacktrace(); // See http://crbug.com/21925. LOG(WARNING) << "locale resources are not loaded"; return string16(); } @@ -156,7 +157,8 @@ string16 ResourceBundle::GetLocalizedString(int message_id) { image = AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(), message_id); if (!image) { - StackTrace().PrintBacktrace(); // See http://crbug.com/21925. + // See http://crbug.com/21925. + base::debug::StackTrace().PrintBacktrace(); NOTREACHED() << "unable to find resource: " << message_id; return std::wstring(); } |