OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_
layer.h" | 5 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_
layer.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "chrome/browser/android/compositor/layer/contextual_search_layer.h" | 8 #include "chrome/browser/android/compositor/layer/contextual_search_layer.h" |
9 #include "content/public/browser/android/content_view_core.h" | 9 #include "content/public/browser/android/content_view_core.h" |
10 #include "jni/ContextualSearchSceneLayer_jni.h" | 10 #include "jni/ContextualSearchSceneLayer_jni.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 arrow_icon_rotation, | 108 arrow_icon_rotation, |
109 close_icon_visible, | 109 close_icon_visible, |
110 close_icon_opacity, | 110 close_icon_opacity, |
111 progress_bar_visible, | 111 progress_bar_visible, |
112 progress_bar_y, | 112 progress_bar_y, |
113 progress_bar_height, | 113 progress_bar_height, |
114 progress_bar_opacity, | 114 progress_bar_opacity, |
115 progress_bar_completion); | 115 progress_bar_completion); |
116 } | 116 } |
117 | 117 |
118 static jlong Init(JNIEnv* env, jobject jobj) { | 118 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
119 // This will automatically bind to the Java object and pass ownership there. | 119 // This will automatically bind to the Java object and pass ownership there. |
120 ContextualSearchSceneLayer* tree_provider = | 120 ContextualSearchSceneLayer* tree_provider = |
121 new ContextualSearchSceneLayer(env, jobj); | 121 new ContextualSearchSceneLayer(env, jobj); |
122 return reinterpret_cast<intptr_t>(tree_provider); | 122 return reinterpret_cast<intptr_t>(tree_provider); |
123 } | 123 } |
124 | 124 |
125 bool RegisterContextualSearchSceneLayer(JNIEnv* env) { | 125 bool RegisterContextualSearchSceneLayer(JNIEnv* env) { |
126 return RegisterNativesImpl(env); | 126 return RegisterNativesImpl(env); |
127 } | 127 } |
128 | 128 |
129 } // namespace android | 129 } // namespace android |
130 } // namespace chrome | 130 } // namespace chrome |
OLD | NEW |