summaryrefslogtreecommitdiffstats
path: root/app/resource_bundle.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 05:56:05 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 05:56:05 +0000
commit426d0393942b3886c94d4fe27e22b1a132d8b41b (patch)
tree91c907cb212c2e43533f7b4e9ad85c6aa41a0864 /app/resource_bundle.cc
parentbe8fd116e295fd7ef6c75e4dd717017d68c7fd57 (diff)
downloadchromium_src-426d0393942b3886c94d4fe27e22b1a132d8b41b.zip
chromium_src-426d0393942b3886c94d4fe27e22b1a132d8b41b.tar.gz
chromium_src-426d0393942b3886c94d4fe27e22b1a132d8b41b.tar.bz2
Move data pack from base to app (it's just part of the resource bundle system).
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/5992006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.cc')
-rw-r--r--app/resource_bundle.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index ab34609..b0e79ed 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -4,7 +4,7 @@
#include "app/resource_bundle.h"
-#include "base/data_pack.h"
+#include "app/data_pack.h"
#include "base/lock.h"
#include "base/logging.h"
#include "base/string_piece.h"
@@ -246,7 +246,7 @@ ResourceBundle::LoadedDataPack::~LoadedDataPack() {
void ResourceBundle::LoadedDataPack::Load() {
DCHECK(!data_pack_.get());
- data_pack_.reset(new base::DataPack);
+ data_pack_.reset(new app::DataPack);
bool success = data_pack_->Load(path_);
CHECK(success) << "Failed to load " << path_.value();
}