Index: ui/base/android/window_android.cc |
diff --git a/ui/base/android/window_android.cc b/ui/base/android/window_android.cc |
index 490c6f3b545f2adfaabf67d3e4efb2766fed84f9..4e33526bdbffafa000d6867a277f6da30f28b248 100644 |
--- a/ui/base/android/window_android.cc |
+++ b/ui/base/android/window_android.cc |
@@ -9,6 +9,7 @@ |
#include "base/android/jni_weak_ref.h" |
#include "base/android/scoped_java_ref.h" |
#include "jni/WindowAndroid_jni.h" |
+#include "ui/base/android/ui_resource_client_android.h" |
#include "ui/base/android/window_android_compositor.h" |
#include "ui/base/android/window_android_observer.h" |
@@ -87,6 +88,19 @@ void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { |
WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); |
} |
+void WindowAndroid::InitializeSystemUIResource( |
+ SystemUIResource system_resource, |
+ scoped_ptr<UIResourceClientAndroid> resource) { |
+ ui_resource_map_.set(system_resource, resource.Pass()); |
+} |
+ |
+cc::UIResourceId WindowAndroid::GetSystemUIResource( |
+ SystemUIResource system_resource) { |
+ if (ui_resource_map_.find(system_resource) == ui_resource_map_.end()) |
jdduke (slow)
2014/07/08 20:10:11
Premature optimization nit =/: Might as well use g
powei
2014/07/12 00:24:46
Done. No longer here.
|
+ return 0; |
+ return ui_resource_map_.get(system_resource)->id(); |
+} |
+ |
void WindowAndroid::OnVSync(JNIEnv* env, jobject obj, jlong time_micros) { |
base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros)); |
FOR_EACH_OBSERVER( |