diff options
| author | jaekyun <jaekyun@chromium.org> | 2014-12-04 08:19:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 16:19:31 +0000 |
| commit | d5de7e4469af397027ca13927c4426baec270d4e (patch) | |
| tree | 1d0bfcd0dce30bac7faf19d6f79cf1ab3e7898fd /content/app | |
| parent | ce662dde5e552e08c14dbb432c05a554e46b1534 (diff) | |
| download | chromium_src-d5de7e4469af397027ca13927c4426baec270d4e.zip chromium_src-d5de7e4469af397027ca13927c4426baec270d4e.tar.gz chromium_src-d5de7e4469af397027ca13927c4426baec270d4e.tar.bz2 | |
Upstream ResourceManager
And expose ResourceManager through the Compositor interface.
https://chrome-internal-review.googlesource.com/184331/ is a counter part in downstream.
BUG=426939
Review URL: https://codereview.chromium.org/731133002
Cr-Commit-Position: refs/heads/master@{#306830}
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/BUILD.gn | 1 | ||||
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index 82af6d7..d5a9371 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -44,6 +44,7 @@ if (is_win) { "//content/public/android:jni", "//skia", "//third_party/android_tools:cpu_features", + "//ui/android", ] } diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index d09e21e..d044e6b 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -25,6 +25,7 @@ #include "device/battery/android/battery_jni_registrar.h" #include "media/base/android/media_jni_registrar.h" #include "net/android/net_jni_registrar.h" +#include "ui/android/ui_android_jni_registrar.h" #include "ui/base/android/ui_base_jni_registrar.h" #include "ui/gfx/android/gfx_jni_registrar.h" #include "ui/gl/android/gl_jni_registrar.h" @@ -69,6 +70,9 @@ bool EnsureJniRegistered(JNIEnv* env) { if (!media::RegisterJni(env)) return false; + if (!ui::RegisterUIAndroidJni(env)) + return false; + g_jni_init_done = true; } |