diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 05:56:05 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 05:56:05 +0000 |
| commit | 426d0393942b3886c94d4fe27e22b1a132d8b41b (patch) | |
| tree | 91c907cb212c2e43533f7b4e9ad85c6aa41a0864 /app/resource_bundle.h | |
| parent | be8fd116e295fd7ef6c75e4dd717017d68c7fd57 (diff) | |
| download | chromium_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.h')
| -rw-r--r-- | app/resource_bundle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/resource_bundle.h b/app/resource_bundle.h index 19905c2..d2c2d59 100644 --- a/app/resource_bundle.h +++ b/app/resource_bundle.h @@ -23,7 +23,7 @@ #include "base/string16.h" #include "gfx/native_widget_types.h" -namespace base { +namespace app { class DataPack; } #if defined(USE_X11) @@ -178,7 +178,7 @@ class ResourceBundle { private: void Load(); - scoped_ptr<base::DataPack> data_pack_; + scoped_ptr<app::DataPack> data_pack_; FilePath path_; DISALLOW_COPY_AND_ASSIGN(LoadedDataPack); @@ -191,7 +191,7 @@ class ResourceBundle { typedef HINSTANCE DataHandle; #elif defined(USE_BASE_DATA_PACK) // Linux uses base::DataPack. - typedef base::DataPack* DataHandle; + typedef app::DataPack* DataHandle; #endif // Ctor/dtor are private, since we're a singleton. |