summaryrefslogtreecommitdiffstats
path: root/chrome/browser/themes
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 /chrome/browser/themes
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 'chrome/browser/themes')
-rw-r--r--chrome/browser/themes/browser_theme_pack.cc8
-rw-r--r--chrome/browser/themes/browser_theme_pack.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 62f09ef..6333900 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/themes/browser_theme_pack.h"
+#include "app/data_pack.h"
#include "app/resource_bundle.h"
-#include "base/data_pack.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
#include "base/thread_restrictions.h"
@@ -370,7 +370,7 @@ scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack(
FilePath path, const std::string& expected_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
scoped_refptr<BrowserThemePack> pack(new BrowserThemePack);
- pack->data_pack_.reset(new base::DataPack);
+ pack->data_pack_.reset(new app::DataPack);
if (!pack->data_pack_->Load(path)) {
LOG(ERROR) << "Failed to load theme data pack.";
@@ -448,7 +448,7 @@ bool BrowserThemePack::WriteToDisk(FilePath path) const {
RepackImages(prepared_images_, &reencoded_images);
AddRawImagesTo(reencoded_images, &resources);
- return base::DataPack::WritePack(path, resources);
+ return app::DataPack::WritePack(path, resources);
}
bool BrowserThemePack::GetTint(int id, color_utils::HSL* hsl) const {
@@ -583,7 +583,7 @@ void BrowserThemePack::BuildHeader(const Extension* extension) {
header_->version = kThemePackVersion;
// TODO(erg): Need to make this endian safe on other computers. Prerequisite
- // is that base::DataPack removes this same check.
+ // is that app::DataPack removes this same check.
#if defined(__BYTE_ORDER)
// Linux check
COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h
index 3771462..b90f30a 100644
--- a/chrome/browser/themes/browser_theme_pack.h
+++ b/chrome/browser/themes/browser_theme_pack.h
@@ -16,7 +16,7 @@
#include "chrome/browser/browser_thread.h"
#include "chrome/common/extensions/extension.h"
-namespace base {
+namespace app {
class DataPack;
}
class DictionaryValue;
@@ -170,7 +170,7 @@ class BrowserThemePack : public base::RefCountedThreadSafe<
color_utils::HSL GetTintInternal(int id) const;
// Data pack, if we have one.
- scoped_ptr<base::DataPack> data_pack_;
+ scoped_ptr<app::DataPack> data_pack_;
// All structs written to disk need to be packed; no alignment tricks here,
// please.