diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
| commit | 42ce29d4f464b36ddaebefb6d6c33e7418e93141 (patch) | |
| tree | 0d0a4965d61ef1514dee70c9f2507529d8c5b178 /webkit/support | |
| parent | 0ffeb598304f119e2d3df70d47a592d2dbc722da (diff) | |
| download | chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.zip chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.gz chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.bz2 | |
Move ResourceBundle, DataPack to ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6263008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 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 4defd31..eef26fb 100644 --- a/webkit/support/platform_support_gtk.cc +++ b/webkit/support/platform_support_gtk.cc @@ -4,7 +4,6 @@ #include "webkit/support/platform_support.h" -#include "app/data_pack.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" @@ -13,11 +12,12 @@ #include "base/string_piece.h" #include "gfx/gfx_module.h" #include "grit/webkit_resources.h" +#include "ui/base/resource/data_pack.h" namespace { // Data resources on linux. This is a pointer to the mmapped resources file. -app::DataPack* g_resource_data_pack = NULL; +ui::DataPack* g_resource_data_pack = NULL; base::StringPiece TestResourceProvider(int resource_id) { base::StringPiece res; @@ -39,7 +39,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 app::DataPack; + g_resource_data_pack = new ui::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 d44195e..54319da 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -8,7 +8,6 @@ #import <Foundation/Foundation.h> #import <objc/objc-runtime.h> -#include "app/data_pack.h" #include "base/base_paths.h" #include "base/file_util.h" #include "base/logging.h" @@ -17,11 +16,12 @@ #include "base/string16.h" #include "grit/webkit_resources.h" #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h" +#include "ui/base/resource/data_pack.h" #include "webkit/plugins/npapi/plugin_list.h" #import "webkit/support/drt_application_mac.h" #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h" -static app::DataPack* g_resource_data_pack = NULL; +static ui::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 app::DataPack; + g_resource_data_pack = new ui::DataPack; NSString* resource_path = [base::mac::MainAppBundle() pathForResource:@"DumpRenderTree" ofType:@"pak"]; |