ui/base/ui_base_paths.cc - Issue 1115033003: resources: Prevent including the same resource in multiple pack files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/ui_base_paths.cc

Issue 1115033003: resources: Prevent including the same resource in multiple pack files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tot-merge Created 5 years, 7 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

Index: ui/base/ui_base_paths.cc

diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc

index 083315d422833c6d7c59ef1d93fddc9ddb12f51e..c0246f8b2b3351aec9a8abfc20a2534dd4ed6d9f 100644

--- a/ui/base/ui_base_paths.cc

+++ b/ui/base/ui_base_paths.cc

@@ -60,8 +60,13 @@ bool PathProvider(int key, base::FilePath* result) {

break;

#endif

case UI_TEST_PAK:

+#if defined(OS_ANDROID)

+ if (!PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur))

+ return false;

+#else

if (!PathService::Get(base::DIR_MODULE, &cur))

return false;

+#endif

cur = cur.AppendASCII("ui_test.pak");

break;

default:

« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | no next file » | no next file with comments »