Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2694)

Unified Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 2684433003: Files required by a service now listed in manifest. (Closed)
Patch Set: Synced + addressed comment from @rockot Created 3 years, 10 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: android_webview/lib/main/aw_main_delegate.cc
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 9b9848edb66a737a633a48665bf95805d5e68968..f7247f088647c1ce121d3674006ed083b28f70df 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -37,7 +37,7 @@
#include "content/public/browser/android/browser_media_player_manager_register.h"
#include "content/public/browser/browser_main_runner.h"
#include "content/public/browser/browser_thread.h"
-#include "content/public/common/content_descriptors.h"
+#include "content/public/common/content_descriptor_keys.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "gin/public/isolate_holder.h"
@@ -132,14 +132,14 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
ui::GestureConfiguration::GetInstance()
->set_fling_touchscreen_tap_suppression_enabled(false);
- base::android::RegisterApkAssetWithGlobalDescriptors(
- kV8NativesDataDescriptor,
+ base::android::RegisterApkAssetWithFileDescriptorStore(
+ content::kV8NativesDataDescriptor,
gin::V8Initializer::GetNativesFilePath().AsUTF8Unsafe());
- base::android::RegisterApkAssetWithGlobalDescriptors(
- kV8SnapshotDataDescriptor32,
+ base::android::RegisterApkAssetWithFileDescriptorStore(
+ content::kV8Snapshot32DataDescriptor,
gin::V8Initializer::GetSnapshotFilePath(true).AsUTF8Unsafe());
- base::android::RegisterApkAssetWithGlobalDescriptors(
- kV8SnapshotDataDescriptor64,
+ base::android::RegisterApkAssetWithFileDescriptorStore(
+ content::kV8Snapshot64DataDescriptor,
gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe());
}
#endif // V8_USE_EXTERNAL_STARTUP_DATA
« no previous file with comments | « android_webview/BUILD.gn ('k') | base/BUILD.gn » ('j') | base/android/apk_assets.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698