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

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

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
Patch Set: More changes from dtrainor@ review Created 5 years, 1 month 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 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LA YER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LA YER_H_
6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LA YER_H_ 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LA YER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_weak_ref.h" 11 #include "base/android/jni_weak_ref.h"
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" 15 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
16 16
17 namespace chrome { 17 namespace chrome {
18 namespace android { 18 namespace android {
19 19
20 class ContextualSearchLayer; 20 class ContextualSearchLayer;
21 21
22 class ContextualSearchSceneLayer : public SceneLayer { 22 class ContextualSearchSceneLayer : public SceneLayer {
23 public: 23 public:
24 ContextualSearchSceneLayer(JNIEnv* env, jobject jobj); 24 ContextualSearchSceneLayer(JNIEnv* env, jobject jobj);
25 ~ContextualSearchSceneLayer() override; 25 ~ContextualSearchSceneLayer() override;
26 26
27 void UpdateContextualSearchLayer(JNIEnv* env, 27 void UpdateContextualSearchLayer(
28 jobject object, 28 JNIEnv* env,
29 jint search_bar_background_resource_id, 29 jobject object,
30 jint search_context_resource_id, 30 jint search_bar_background_resource_id,
31 jint search_term_resource_id, 31 jint search_context_resource_id,
32 jint search_bar_shadow_resource_id, 32 jint search_term_resource_id,
33 jint search_provider_icon_resource_id, 33 jint search_bar_shadow_resource_id,
34 jint arrow_up_resource_id, 34 jint arrow_up_resource_id,
35 jint close_icon_resource_id, 35 jint close_icon_resource_id,
36 jint progress_bar_background_resource_id, 36 jint progress_bar_background_resource_id,
37 jint progress_bar_resource_id, 37 jint progress_bar_resource_id,
38 jint search_promo_resource_id, 38 jint search_promo_resource_id,
39 jint peek_promo_ripple_resource_id, 39 jint peek_promo_ripple_resource_id,
40 jint peek_promo_text_resource_id, 40 jint peek_promo_text_resource_id,
41 jobject jcontent_view_core, 41 jint search_provider_icon_sprite_bitmap_resource_id,
42 jboolean search_promo_visible, 42 jint search_provider_icon_sprite_metadata_resource_id,
43 jfloat search_promo_height, 43 jobject jcontent_view_core,
44 jfloat search_promo_opacity, 44 jboolean search_promo_visible,
45 jboolean search_peek_promo_visible, 45 jfloat search_promo_height,
46 jfloat search_peek_promo_height, 46 jfloat search_promo_opacity,
47 jfloat search_peek_promo_padding, 47 jboolean search_peek_promo_visible,
48 jfloat search_peek_promo_ripple_width, 48 jfloat search_peek_promo_height,
49 jfloat search_peek_promo_ripple_opacity, 49 jfloat search_peek_promo_padding,
50 jfloat search_peek_promo_text_opacity, 50 jfloat search_peek_promo_ripple_width,
51 jfloat search_panel_X, 51 jfloat search_peek_promo_ripple_opacity,
52 jfloat search_panel_y, 52 jfloat search_peek_promo_text_opacity,
53 jfloat search_panel_width, 53 jfloat search_panel_X,
54 jfloat search_panel_height, 54 jfloat search_panel_y,
55 jfloat search_bar_margin_side, 55 jfloat search_panel_width,
56 jfloat search_bar_height, 56 jfloat search_panel_height,
57 jfloat search_context_opacity, 57 jfloat search_bar_margin_side,
58 jfloat search_term_opacity, 58 jfloat search_bar_height,
59 jboolean search_bar_border_visible, 59 jfloat search_context_opacity,
60 jfloat search_bar_border_height, 60 jfloat search_term_opacity,
61 jboolean search_bar_shadow_visible, 61 jboolean search_bar_border_visible,
62 jfloat search_bar_shadow_opacity, 62 jfloat search_bar_border_height,
63 jfloat arrow_icon_opacity, 63 jboolean search_bar_shadow_visible,
64 jfloat arrow_icon_rotation, 64 jfloat search_bar_shadow_opacity,
65 jfloat close_icon_opacity, 65 jboolean search_provider_icon_sprite_visible,
66 jboolean progress_bar_visible, 66 jfloat search_provider_icon_sprite_completion_percentage,
67 jfloat progress_bar_height, 67 jfloat search_provider_icon_sprite_size,
68 jfloat progress_bar_opacity, 68 jfloat arrow_icon_opacity,
69 jint progress_bar_completion, 69 jfloat arrow_icon_rotation,
70 jobject jresource_manager); 70 jfloat close_icon_opacity,
71 jboolean progress_bar_visible,
72 jfloat progress_bar_height,
73 jfloat progress_bar_opacity,
74 jint progress_bar_completion,
75 jobject jresource_manager);
71 76
72 private: 77 private:
73 scoped_refptr<ContextualSearchLayer> contextual_search_layer_; 78 scoped_refptr<ContextualSearchLayer> contextual_search_layer_;
74 79
75 DISALLOW_COPY_AND_ASSIGN(ContextualSearchSceneLayer); 80 DISALLOW_COPY_AND_ASSIGN(ContextualSearchSceneLayer);
76 }; 81 };
77 82
78 bool RegisterContextualSearchSceneLayer(JNIEnv* env); 83 bool RegisterContextualSearchSceneLayer(JNIEnv* env);
79 84
80 } // namespace android 85 } // namespace android
81 } // namespace chrome 86 } // namespace chrome
82 87
83 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE _LAYER_H_ 88 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE _LAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698