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

Unified Diff: content/test/test_content_client.cc

Issue 10907198: Do not load content_resources.pak on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review: Fix nits. Created 8 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_content_client.cc
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index dc14eb193edf2ea51b524d4b03f33d0e5676bfd4..b8aeea558cc99089dfd121294ca8ed31ca55badb 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -12,11 +12,14 @@
TestContentClient::TestContentClient()
: data_pack_(ui::SCALE_FACTOR_100P) {
+ // content_resources.pak is not built on iOS as it is not required.
+#if !defined(OS_IOS)
FilePath content_resources_pack_path;
PathService::Get(base::DIR_MODULE, &content_resources_pack_path);
content_resources_pack_path = content_resources_pack_path.Append(
FILE_PATH_LITERAL("content_resources.pak"));
data_pack_.LoadFromPath(content_resources_pack_path);
+#endif
}
TestContentClient::~TestContentClient() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698