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

Side by Side Diff: chrome/browser/android/compositor/layer/contextual_search_layer.h

Issue 2518503004: [TTS] Fix Bar text showing blank after startup. (Closed)
Patch Set: Responded to Matt's comments, removed some checks that were not needed. Created 4 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_LAYER_CONTEXTUAL_SEARCH_LAYER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_ 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "chrome/browser/android/compositor/layer/overlay_panel_layer.h" 10 #include "chrome/browser/android/compositor/layer/overlay_panel_layer.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 float static_image_visibility_percentage); 116 float static_image_visibility_percentage);
117 117
118 void SetStaticImageProperties( 118 void SetStaticImageProperties(
119 scoped_refptr<cc::UIResourceLayer> static_image_layer, 119 scoped_refptr<cc::UIResourceLayer> static_image_layer,
120 float top_margin, 120 float top_margin,
121 float side_margin, 121 float side_margin,
122 float visibility_percentage); 122 float visibility_percentage);
123 123
124 // Sets up |text_layer_|, which contains |bar_text_|, |search_context_| and 124 // Sets up |text_layer_|, which contains |bar_text_|, |search_context_| and
125 // |search_caption_|. 125 // |search_caption_|.
126 void SetupTextLayer( 126 void SetupTextLayer(float search_bar_top,
127 float search_bar_top, 127 float search_bar_height,
128 float search_bar_height, 128 float search_text_layer_min_height,
129 float search_text_layer_min_height, 129 int search_caption_resource_id,
130 int search_caption_resource_id, 130 bool search_caption_visible,
131 bool search_caption_visible, 131 float search_caption_animation_percentage,
132 float search_caption_animation_percentage, 132 float search_term_opacity,
133 int search_context_resource_id, 133 int search_context_resource_id,
134 float search_context_opacity, 134 float search_context_opacity,
135 float search_term_caption_spacing); 135 float search_term_caption_spacing);
136 136
137 int static_image_size_; 137 int static_image_size_;
138 float thumbnail_side_margin_; 138 float thumbnail_side_margin_;
139 float thumbnail_top_margin_; 139 float thumbnail_top_margin_;
140 140
141 scoped_refptr<cc::UIResourceLayer> search_context_; 141 scoped_refptr<cc::UIResourceLayer> search_context_;
142 scoped_refptr<cc::Layer> icon_layer_; 142 scoped_refptr<cc::Layer> icon_layer_;
143 scoped_refptr<CrushedSpriteLayer> search_provider_icon_sprite_; 143 scoped_refptr<CrushedSpriteLayer> search_provider_icon_sprite_;
144 scoped_refptr<cc::UIResourceLayer> thumbnail_layer_; 144 scoped_refptr<cc::UIResourceLayer> thumbnail_layer_;
145 scoped_refptr<cc::UIResourceLayer> quick_action_icon_layer_; 145 scoped_refptr<cc::UIResourceLayer> quick_action_icon_layer_;
146 scoped_refptr<cc::UIResourceLayer> arrow_icon_; 146 scoped_refptr<cc::UIResourceLayer> arrow_icon_;
147 scoped_refptr<cc::UIResourceLayer> search_promo_; 147 scoped_refptr<cc::UIResourceLayer> search_promo_;
148 scoped_refptr<cc::SolidColorLayer> search_promo_container_; 148 scoped_refptr<cc::SolidColorLayer> search_promo_container_;
149 scoped_refptr<cc::SolidColorLayer> peek_promo_container_; 149 scoped_refptr<cc::SolidColorLayer> peek_promo_container_;
150 scoped_refptr<cc::NinePatchLayer> peek_promo_ripple_; 150 scoped_refptr<cc::NinePatchLayer> peek_promo_ripple_;
151 scoped_refptr<cc::UIResourceLayer> peek_promo_text_; 151 scoped_refptr<cc::UIResourceLayer> peek_promo_text_;
152 scoped_refptr<cc::NinePatchLayer> progress_bar_; 152 scoped_refptr<cc::NinePatchLayer> progress_bar_;
153 scoped_refptr<cc::NinePatchLayer> progress_bar_background_; 153 scoped_refptr<cc::NinePatchLayer> progress_bar_background_;
154 scoped_refptr<cc::UIResourceLayer> search_caption_; 154 scoped_refptr<cc::UIResourceLayer> search_caption_;
155 scoped_refptr<cc::UIResourceLayer> text_layer_; 155 scoped_refptr<cc::UIResourceLayer> text_layer_;
156 scoped_refptr<cc::SolidColorLayer> divider_line_; 156 scoped_refptr<cc::SolidColorLayer> divider_line_;
157 scoped_refptr<cc::SolidColorLayer> touch_highlight_layer_; 157 scoped_refptr<cc::SolidColorLayer> touch_highlight_layer_;
158 }; 158 };
159 159
160 } // namespace android 160 } // namespace android
161 161
162 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_ 162 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698