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

Side by Side Diff: chrome/browser/android/compositor/layer/contextual_search_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: Changes from reviews Created 5 years, 3 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 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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/android/compositor/layer/layer.h" 10 #include "chrome/browser/android/compositor/layer/layer.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 float search_panel_height, 52 float search_panel_height,
53 float search_bar_margin_side, 53 float search_bar_margin_side,
54 float search_bar_height, 54 float search_bar_height,
55 float search_context_opacity, 55 float search_context_opacity,
56 float search_term_opacity, 56 float search_term_opacity,
57 bool search_bar_border_visible, 57 bool search_bar_border_visible,
58 float search_bar_border_y, 58 float search_bar_border_y,
59 float search_bar_border_height, 59 float search_bar_border_height,
60 bool search_bar_shadow_visible, 60 bool search_bar_shadow_visible,
61 float search_bar_shadow_opacity, 61 float search_bar_shadow_opacity,
62 float search_provider_icon_sprite_size,
63 int search_provider_icon_sprite_frame,
62 float arrow_icon_opacity, 64 float arrow_icon_opacity,
63 float arrow_icon_rotation, 65 float arrow_icon_rotation,
64 bool close_icon_visible, 66 bool close_icon_visible,
65 float close_icon_opacity, 67 float close_icon_opacity,
66 bool progress_bar_visible, 68 bool progress_bar_visible,
67 float progress_bar_y, 69 float progress_bar_y,
68 float progress_bar_height, 70 float progress_bar_height,
69 float progress_bar_opacity, 71 float progress_bar_opacity,
70 int progress_bar_completion); 72 int progress_bar_completion);
71 73
72 scoped_refptr<cc::Layer> layer() override; 74 scoped_refptr<cc::Layer> layer() override;
73 75
74 protected: 76 protected:
75 explicit ContextualSearchLayer(ui::ResourceManager* resource_manager); 77 explicit ContextualSearchLayer(ui::ResourceManager* resource_manager);
76 ~ContextualSearchLayer() override; 78 ~ContextualSearchLayer() override;
77 79
78 private: 80 private:
81 // Uses the |sprite_frame| to determine the portion of
82 // search_provider_icon_sprite_ that gets drawn.
83 void SetSearchProviderIconSpriteFrame(int sprite_frame);
84
79 ui::ResourceManager* resource_manager_; 85 ui::ResourceManager* resource_manager_;
80 86
81 scoped_refptr<cc::Layer> layer_; 87 scoped_refptr<cc::Layer> layer_;
82 scoped_refptr<cc::NinePatchLayer> panel_shadow_; 88 scoped_refptr<cc::NinePatchLayer> panel_shadow_;
83 scoped_refptr<cc::SolidColorLayer> search_bar_background_; 89 scoped_refptr<cc::SolidColorLayer> search_bar_background_;
84 scoped_refptr<cc::UIResourceLayer> search_context_; 90 scoped_refptr<cc::UIResourceLayer> search_context_;
85 scoped_refptr<cc::UIResourceLayer> search_term_; 91 scoped_refptr<cc::UIResourceLayer> search_term_;
86 scoped_refptr<cc::UIResourceLayer> search_bar_shadow_; 92 scoped_refptr<cc::UIResourceLayer> search_bar_shadow_;
87 scoped_refptr<cc::UIResourceLayer> search_provider_icon_; 93 scoped_refptr<cc::UIResourceLayer> search_provider_icon_sprite_;
88 scoped_refptr<cc::UIResourceLayer> arrow_icon_; 94 scoped_refptr<cc::UIResourceLayer> arrow_icon_;
89 scoped_refptr<cc::UIResourceLayer> close_icon_; 95 scoped_refptr<cc::UIResourceLayer> close_icon_;
90 scoped_refptr<cc::Layer> content_view_container_; 96 scoped_refptr<cc::Layer> content_view_container_;
91 scoped_refptr<cc::SolidColorLayer> search_bar_border_; 97 scoped_refptr<cc::SolidColorLayer> search_bar_border_;
92 scoped_refptr<cc::NinePatchLayer> progress_bar_; 98 scoped_refptr<cc::NinePatchLayer> progress_bar_;
93 scoped_refptr<cc::NinePatchLayer> progress_bar_background_; 99 scoped_refptr<cc::NinePatchLayer> progress_bar_background_;
94 scoped_refptr<cc::UIResourceLayer> search_promo_; 100 scoped_refptr<cc::UIResourceLayer> search_promo_;
95 scoped_refptr<cc::SolidColorLayer> search_promo_container_; 101 scoped_refptr<cc::SolidColorLayer> search_promo_container_;
102
103 int search_provider_icon_sprites_per_row_;
104 int search_provider_icon_sprite_rows_;
96 }; 105 };
97 106
98 } // namespace android 107 } // namespace android
99 } // namespace chrome 108 } // namespace chrome
100 109
101 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_ 110 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698