| Index: android_webview/browser/aw_browser_main_parts.cc
|
| diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
|
| index 8bbdb851933ca66792b87d1a806ff3419762bf68..787737e44b0f6515607450decf8c3b23c46dbf7d 100644
|
| --- a/android_webview/browser/aw_browser_main_parts.cc
|
| +++ b/android_webview/browser/aw_browser_main_parts.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "android_webview/browser/aw_browser_context.h"
|
| #include "android_webview/browser/aw_result_codes.h"
|
| -#include "android_webview/native/aw_assets.h"
|
| +#include "android_webview/native/public/aw_assets_utils.h"
|
| #include "base/android/build_info.h"
|
| #include "base/android/locale_utils.h"
|
| #include "base/android/memory_pressure_listener_android.h"
|
| @@ -59,7 +59,7 @@ int AwBrowserMainParts::PreCreateThreads() {
|
| NULL,
|
| ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
|
| std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak";
|
| - if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {
|
| + if (AwAssetsUtils::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {
|
| VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off
|
| << " len=" << pak_len;
|
| ui::ResourceBundle::CleanupSharedInstance();
|
| @@ -72,7 +72,8 @@ int AwBrowserMainParts::PreCreateThreads() {
|
|
|
| // Try to directly mmap the webviewchromium.pak from the apk. Fall back to
|
| // load from file, using PATH_SERVICE, otherwise.
|
| - if (AwAssets::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) {
|
| + if (AwAssetsUtils::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off,
|
| + &pak_len)) {
|
| VLOG(0) << "Loading webviewchromium.pak from, fd:" << pak_fd
|
| << " off:" << pak_off << " len:" << pak_len;
|
| ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
|
|
|