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

Unified Diff: webkit/support/platform_support_mac.mm

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months 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 72000)
+++ webkit/support/platform_support_mac.mm (working copy)
@@ -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 @@
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"];
« 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