ui/base/resource/resource_bundle_android.cc - Issue 10686005: Add methods to add DataPack from open 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/resource/resource_bundle_android.cc

Issue 10686005: Add methods to add DataPack from open files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

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

Index: ui/base/resource/resource_bundle_android.cc

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

index b8d30d48f4d7e57dc423e25ebc3c303b6ce42e53..d5f7316a5be0755999f55433b9ceb24e4bdb9014 100644

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

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

@@ -29,12 +29,12 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {

namespace ui {

void ResourceBundle::LoadCommonResources() {

- AddDataPack(GetResourcesPakFilePath("chrome.pak"),

- SCALE_FACTOR_100P);

- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),

- SCALE_FACTOR_100P);

- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),

- SCALE_FACTOR_100P);

+ AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),

+ SCALE_FACTOR_100P);

+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),

+ SCALE_FACTOR_100P);

+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),

+ SCALE_FACTOR_100P);

}

gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {

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