chrome/browser/chrome_browser_main.cc - Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up).

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: chrome/browser/chrome_browser_main.cc

Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@raw-paks

Patch Set: self code review Created 5 years, 6 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: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 462a2755262be0271d2f2161658ae910a610cd2b..eebc1eee6b398437fb877bcce387f460efd0f743 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -150,6 +150,7 @@

#if defined(OS_ANDROID)

#include "chrome/browser/android/dev_tools_discovery_provider_android.h"

#include "chrome/browser/metrics/thread_watcher_android.h"

+#include "ui/base/resource/resource_bundle_android.h"

#else

#include "chrome/browser/devtools/chrome_devtools_discovery_provider.h"

#include "chrome/browser/feedback/feedback_profile_observer.h"

@@ -916,13 +917,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {

CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;

browser_process_->SetApplicationLocale(loaded_locale);

- base::FilePath resources_pack_path;

- PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);

{

TRACE_EVENT0("startup",

"ChromeBrowserMainParts::PreCreateThreadsImpl:AddDataPack");

- ResourceBundle::GetSharedInstance().AddDataPackFromPath(

- resources_pack_path, ui::SCALE_FACTOR_NONE);

+ ResourceBundle::AddMainDataPack();

}

#endif // defined(OS_MACOSX)

« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | ui/base/resource/resource_bundle_android.h » ('J')