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 /webkit/support | |
| 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 'webkit/support')
| -rw-r--r-- | webkit/support/platform_support_gtk.cc | 6 | ||||
| -rw-r--r-- | webkit/support/platform_support_mac.mm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/support/platform_support_gtk.cc b/webkit/support/platform_support_gtk.cc index f9f177f..2ab9627 100644 --- a/webkit/support/platform_support_gtk.cc +++ b/webkit/support/platform_support_gtk.cc @@ -4,7 +4,7 @@ #include "webkit/support/platform_support.h" -#include "base/data_pack.h" +#include "app/data_pack.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" @@ -16,7 +16,7 @@ namespace { // Data resources on linux. This is a pointer to the mmapped resources file. -base::DataPack* g_resource_data_pack = NULL; +app::DataPack* g_resource_data_pack = NULL; } @@ -31,7 +31,7 @@ void BeforeInitialize(bool unit_test_mode) { void AfterInitialize(bool unit_test_mode) { if (unit_test_mode) return; // We don't have a resource pack when running the unit-tests. - g_resource_data_pack = new base::DataPack; + g_resource_data_pack = new app::DataPack; FilePath data_path; PathService::Get(base::DIR_EXE, &data_path); data_path = data_path.Append("DumpRenderTree.pak"); diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index 8ff15a7..0e9000f 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -8,8 +8,8 @@ #import <Foundation/Foundation.h> #import <objc/objc-runtime.h> +#include "app/data_pack.h" #include "base/base_paths.h" -#include "base/data_pack.h" #include "base/file_util.h" #include "base/logging.h" #include "base/mac_util.h" @@ -21,7 +21,7 @@ #import "webkit/support/drt_application_mac.h" #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h" -static base::DataPack* g_resource_data_pack = NULL; +static app::DataPack* g_resource_data_pack = NULL; namespace webkit_support { @@ -102,7 +102,7 @@ void AfterInitialize(bool unit_test_mode) { return; // We don't have a resource pack when running the unit-tests. // Load a data pack. - g_resource_data_pack = new base::DataPack; + g_resource_data_pack = new app::DataPack; NSString* resource_path = [mac_util::MainAppBundle() pathForResource:@"DumpRenderTree" ofType:@"pak"]; |