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

Unified Diff: webkit/support/platform_support_mac.mm

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 | « webkit/support/platform_support_gtk.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/platform_support_mac.mm
===================================================================
--- webkit/support/platform_support_mac.mm (revision 69975)
+++ webkit/support/platform_support_mac.mm (working copy)
@@ -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 @@
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"];
« no previous file with comments | « webkit/support/platform_support_gtk.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698