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/tools/test_shell/test_shell_mac.mm | |
| 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/tools/test_shell/test_shell_mac.mm')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_mac.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 9378bea..7fed43c 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -9,7 +9,6 @@ #include "webkit/tools/test_shell/test_shell.h" -#include "app/data_pack.h" #include "base/base_paths.h" #include "base/basictypes.h" #include "base/debug/debugger.h" @@ -30,6 +29,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/resource/data_pack.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_list.h" @@ -69,7 +69,7 @@ const int kTestWindowXLocation = -14000; const int kTestWindowYLocation = -14000; // Data pack resource. This is a pointer to the mmapped resources file. -static app::DataPack* g_resource_data_pack = NULL; +static ui::DataPack* g_resource_data_pack = NULL; // Define static member variables base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> > @@ -209,7 +209,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode, // mmap the data pack which holds strings used by WebCore. This is only // a fatal error if we're bundled, which means we might be running layout // tests. This is a harmless failure for test_shell_tests. - g_resource_data_pack = new app::DataPack; + g_resource_data_pack = new ui::DataPack; NSString *resource_path = [base::mac::MainAppBundle() pathForResource:@"test_shell" ofType:@"pak"]; |