summaryrefslogtreecommitdiffstats
path: root/app/resource_bundle.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 00:29:05 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 00:29:05 +0000
commitcba920c94cb99e0c7b6a0dd06b124902699a0aee (patch)
treed5d346cdbebd8fef4e33ad784026e1878299e015 /app/resource_bundle.cc
parent5b94218ebe61b11e24798536c5a6d13695006e8b (diff)
downloadchromium_src-cba920c94cb99e0c7b6a0dd06b124902699a0aee.zip
chromium_src-cba920c94cb99e0c7b6a0dd06b124902699a0aee.tar.gz
chromium_src-cba920c94cb99e0c7b6a0dd06b124902699a0aee.tar.bz2
Downgrade a CHECK to a LOG(ERROR) so we don't crash if we
fail to load resources.pak. This allows us to collect more UMA stats. BUG=58056 TEST=Delete resources.pak and start chrome. It shouldn't crash. Review URL: http://codereview.chromium.org/6123006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.cc')
-rw-r--r--app/resource_bundle.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index b0e79ed..93669bc 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -248,7 +248,9 @@ void ResourceBundle::LoadedDataPack::Load() {
DCHECK(!data_pack_.get());
data_pack_.reset(new app::DataPack);
bool success = data_pack_->Load(path_);
- CHECK(success) << "Failed to load " << path_.value();
+ LOG_IF(ERROR, !success) << "Failed to load " << path_.value()
+ << "\nYou will not be able to use the Bookmarks Manager or "
+ << "about:net-internals.";
}
bool ResourceBundle::LoadedDataPack::GetStringPiece(