ui/base/resource/resource_bundle_android.h - Issue 2235753002: Merge webviewchromium.pak and resources.pak in Monochrome

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/resource/resource_bundle_android.h

Issue 2235753002: Merge webviewchromium.pak and resources.pak in Monochrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: upstream monochrome asset build Created 4 years, 4 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/resource/resource_bundle_android.h

diff --git a/ui/base/resource/resource_bundle_android.h b/ui/base/resource/resource_bundle_android.h

index e975a39f4ed0f3f11bed82abc65e910e6cb7d02a..be7da363ab09d2e064e7bbce2abe6dfc8cd7b840 100644

--- a/ui/base/resource/resource_bundle_android.h

+++ b/ui/base/resource/resource_bundle_android.h

@@ -14,8 +14,8 @@

namespace ui {

// Loads "resources.apk" from the .apk. Falls back to loading from disk, which

-// is necessary for tests.

-UI_BASE_EXPORT void LoadMainAndroidPackFile(

+// is necessary for tests. Returns true if it succeeds, false otherwise.

+UI_BASE_EXPORT bool LoadMainAndroidPackFile(

const char* path_within_apk,

const base::FilePath& disk_file_path);

« chrome/BUILD.gn ('K') | « chrome/BUILD.gn ('k') | ui/base/resource/resource_bundle_android.cc » ('j') | no next file with comments »