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..c58432b4fd8d3b4efbcef308eb7b75fd7545c919 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,17 @@ 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"); |
+#if defined(OS_ANDROID) |
+ ui::LoadMainAndroidPackFile(); |
+#else |
+ base::FilePath resources_pack_path; |
+ PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); |
ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
resources_pack_path, ui::SCALE_FACTOR_NONE); |
+#endif // defined(OS_ANDROID) |
} |
#endif // defined(OS_MACOSX) |