| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 jfloat search_panel_height, | 44 jfloat search_panel_height, |
| 45 jfloat search_bar_margin_side, | 45 jfloat search_bar_margin_side, |
| 46 jfloat search_bar_height, | 46 jfloat search_bar_height, |
| 47 jfloat search_context_opacity, | 47 jfloat search_context_opacity, |
| 48 jfloat search_term_opacity, | 48 jfloat search_term_opacity, |
| 49 jboolean search_bar_border_visible, | 49 jboolean search_bar_border_visible, |
| 50 jfloat search_bar_border_y, | 50 jfloat search_bar_border_y, |
| 51 jfloat search_bar_border_height, | 51 jfloat search_bar_border_height, |
| 52 jboolean search_bar_shadow_visible, | 52 jboolean search_bar_shadow_visible, |
| 53 jfloat search_bar_shadow_opacity, | 53 jfloat search_bar_shadow_opacity, |
| 54 jboolean search_provider_icon_visible, |
| 55 jint search_provider_icon_sprites_per_row, |
| 56 jint search_provider_icon_sprite_rows, |
| 57 jint search_provider_icon_sprite_frame, |
| 54 jfloat arrow_icon_opacity, | 58 jfloat arrow_icon_opacity, |
| 55 jfloat arrow_icon_rotation, | 59 jfloat arrow_icon_rotation, |
| 56 jboolean close_icon_visible, | 60 jboolean close_icon_visible, |
| 57 jfloat close_icon_opacity, | 61 jfloat close_icon_opacity, |
| 58 jboolean progress_bar_visible, | 62 jboolean progress_bar_visible, |
| 59 jfloat progress_bar_y, | 63 jfloat progress_bar_y, |
| 60 jfloat progress_bar_height, | 64 jfloat progress_bar_height, |
| 61 jfloat progress_bar_opacity, | 65 jfloat progress_bar_opacity, |
| 62 jint progress_bar_completion, | 66 jint progress_bar_completion, |
| 63 jobject jresource_manager) { | 67 jobject jresource_manager) { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 search_panel_height, | 105 search_panel_height, |
| 102 search_bar_margin_side, | 106 search_bar_margin_side, |
| 103 search_bar_height, | 107 search_bar_height, |
| 104 search_context_opacity, | 108 search_context_opacity, |
| 105 search_term_opacity, | 109 search_term_opacity, |
| 106 search_bar_border_visible, | 110 search_bar_border_visible, |
| 107 search_bar_border_y, | 111 search_bar_border_y, |
| 108 search_bar_border_height, | 112 search_bar_border_height, |
| 109 search_bar_shadow_visible, | 113 search_bar_shadow_visible, |
| 110 search_bar_shadow_opacity, | 114 search_bar_shadow_opacity, |
| 115 search_provider_icon_visible, |
| 116 search_provider_icon_sprites_per_row, |
| 117 search_provider_icon_sprite_rows, |
| 118 search_provider_icon_sprite_frame, |
| 111 arrow_icon_opacity, | 119 arrow_icon_opacity, |
| 112 arrow_icon_rotation, | 120 arrow_icon_rotation, |
| 113 close_icon_visible, | 121 close_icon_visible, |
| 114 close_icon_opacity, | 122 close_icon_opacity, |
| 115 progress_bar_visible, | 123 progress_bar_visible, |
| 116 progress_bar_y, | 124 progress_bar_y, |
| 117 progress_bar_height, | 125 progress_bar_height, |
| 118 progress_bar_opacity, | 126 progress_bar_opacity, |
| 119 progress_bar_completion); | 127 progress_bar_completion); |
| 120 } | 128 } |
| 121 | 129 |
| 122 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { | 130 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
| 123 // This will automatically bind to the Java object and pass ownership there. | 131 // This will automatically bind to the Java object and pass ownership there. |
| 124 ContextualSearchSceneLayer* tree_provider = | 132 ContextualSearchSceneLayer* tree_provider = |
| 125 new ContextualSearchSceneLayer(env, jobj); | 133 new ContextualSearchSceneLayer(env, jobj); |
| 126 return reinterpret_cast<intptr_t>(tree_provider); | 134 return reinterpret_cast<intptr_t>(tree_provider); |
| 127 } | 135 } |
| 128 | 136 |
| 129 bool RegisterContextualSearchSceneLayer(JNIEnv* env) { | 137 bool RegisterContextualSearchSceneLayer(JNIEnv* env) { |
| 130 return RegisterNativesImpl(env); | 138 return RegisterNativesImpl(env); |
| 131 } | 139 } |
| 132 | 140 |
| 133 } // namespace android | 141 } // namespace android |
| 134 } // namespace chrome | 142 } // namespace chrome |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1337703002:
[Contextual Search] Add support for crushed sprites and animate the search provider icon (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master