Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1585)

Unified Diff: app/resource_bundle.h

Issue 5992006: Move data pack from base to app (it's just part of the resource bundle system... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/data_pack_unittest.cc ('k') | app/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/resource_bundle.h
===================================================================
--- app/resource_bundle.h (revision 69975)
+++ app/resource_bundle.h (working copy)
@@ -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 @@
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 @@
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.
« no previous file with comments | « app/data_pack_unittest.cc ('k') | app/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698