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

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 852433002: [Android] Upstream scene layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 5 years, 11 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/android/chrome_jni_registrar.cc
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 29c8ea355f56c53241592a35534781e0a0c8cb1b..acaf83fe03a2c870806f713ef94906b393193331 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -15,6 +15,8 @@
#include "chrome/browser/android/chrome_web_contents_delegate_android.h"
#include "chrome/browser/android/chromium_application.h"
#include "chrome/browser/android/compositor/layer_title_cache.h"
+#include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
+#include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h"
#include "chrome/browser/android/compositor/tab_content_manager.h"
#include "chrome/browser/android/content_view_util.h"
#include "chrome/browser/android/dev_tools_server.h"
@@ -196,10 +198,12 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"ProfileDownloader", RegisterProfileDownloader},
{"ProfileSyncService", ProfileSyncServiceAndroid::Register},
{"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register},
+ {"SceneLayer", chrome::android::RegisterSceneLayer},
{"SigninManager", SigninManagerAndroid::Register},
{"SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
{"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid},
{"StartupMetricUtils", RegisterStartupMetricUtils},
+ {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer},
{"TabAndroid", TabAndroid::RegisterTabAndroid},
{"TabContentManager", chrome::android::RegisterTabContentManager},
{"TabModelJniBridge", TabModelJniBridge::Register},

Powered by Google App Engine
This is Rietveld 408576698