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

Side by Side Diff: chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc

Issue 1237913002: [Contextual Search] Adds basic support for narrow Search Panel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 unified diff | Download patch
OLDNEW
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 20 matching lines...) Expand all
31 jint search_icon_resource_id, 31 jint search_icon_resource_id,
32 jint arrow_up_resource_id, 32 jint arrow_up_resource_id,
33 jint close_icon_resource_id, 33 jint close_icon_resource_id,
34 jint progress_bar_background_resource_id, 34 jint progress_bar_background_resource_id,
35 jint progress_bar_resource_id, 35 jint progress_bar_resource_id,
36 jint search_promo_resource_id, 36 jint search_promo_resource_id,
37 jobject jcontent_view_core, 37 jobject jcontent_view_core,
38 jboolean search_promo_visible, 38 jboolean search_promo_visible,
39 jfloat search_promo_height, 39 jfloat search_promo_height,
40 jfloat search_promo_opacity, 40 jfloat search_promo_opacity,
41 jfloat search_panel_X,
41 jfloat search_panel_y, 42 jfloat search_panel_y,
42 jfloat search_panel_width, 43 jfloat search_panel_width,
44 jfloat search_panel_height,
43 jfloat search_bar_margin_top, 45 jfloat search_bar_margin_top,
44 jfloat search_bar_margin_side, 46 jfloat search_bar_margin_side,
45 jfloat search_bar_height, 47 jfloat search_bar_height,
46 jfloat search_bar_text_opacity, 48 jfloat search_bar_text_opacity,
47 jboolean search_bar_border_visible, 49 jboolean search_bar_border_visible,
48 jfloat search_bar_border_y, 50 jfloat search_bar_border_y,
49 jfloat search_bar_border_height, 51 jfloat search_bar_border_height,
50 jboolean search_bar_shadow_visible, 52 jboolean search_bar_shadow_visible,
51 jfloat search_bar_shadow_opacity, 53 jfloat search_bar_shadow_opacity,
52 jboolean side_search_provider_icon_visible, 54 jboolean side_search_provider_icon_visible,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 search_icon_resource_id, 93 search_icon_resource_id,
92 arrow_up_resource_id, 94 arrow_up_resource_id,
93 close_icon_resource_id, 95 close_icon_resource_id,
94 progress_bar_background_resource_id, 96 progress_bar_background_resource_id,
95 progress_bar_resource_id, 97 progress_bar_resource_id,
96 search_promo_resource_id, 98 search_promo_resource_id,
97 content_view_core, 99 content_view_core,
98 search_promo_visible, 100 search_promo_visible,
99 search_promo_height, 101 search_promo_height,
100 search_promo_opacity, 102 search_promo_opacity,
103 search_panel_X,
101 search_panel_y, 104 search_panel_y,
102 search_panel_width, 105 search_panel_width,
106 search_panel_height,
103 search_bar_margin_top, 107 search_bar_margin_top,
104 search_bar_margin_side, 108 search_bar_margin_side,
105 search_bar_height, 109 search_bar_height,
106 search_bar_text_opacity, 110 search_bar_text_opacity,
107 search_bar_border_visible, 111 search_bar_border_visible,
108 search_bar_border_y, 112 search_bar_border_y,
109 search_bar_border_height, 113 search_bar_border_height,
110 search_bar_shadow_visible, 114 search_bar_shadow_visible,
111 search_bar_shadow_opacity, 115 search_bar_shadow_opacity,
112 side_search_provider_icon_visible, 116 side_search_provider_icon_visible,
(...skipping 18 matching lines...) Expand all
131 new ContextualSearchSceneLayer(env, jobj); 135 new ContextualSearchSceneLayer(env, jobj);
132 return reinterpret_cast<intptr_t>(tree_provider); 136 return reinterpret_cast<intptr_t>(tree_provider);
133 } 137 }
134 138
135 bool RegisterContextualSearchSceneLayer(JNIEnv* env) { 139 bool RegisterContextualSearchSceneLayer(JNIEnv* env) {
136 return RegisterNativesImpl(env); 140 return RegisterNativesImpl(env);
137 } 141 }
138 142
139 } // namespace android 143 } // namespace android
140 } // namespace chrome 144 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698