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

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

Issue 2142263002: Remove ContentViewCore dependency from OverlayPanel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 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"
11 11
12 namespace cc { 12 namespace cc {
13 class Layer; 13 class Layer;
14 class NinePatchLayer; 14 class NinePatchLayer;
15 class SolidColorLayer; 15 class SolidColorLayer;
16 class UIResourceLayer; 16 class UIResourceLayer;
17 } 17 }
18 18
19 namespace content { 19 namespace cc {
20 class ContentViewCore; 20 class Layer;
21 } 21 }
22 22
23 namespace ui { 23 namespace ui {
24 class ResourceManager; 24 class ResourceManager;
25 } 25 }
26 26
27 namespace chrome { 27 namespace chrome {
28 namespace android { 28 namespace android {
29 29
30 class CrushedSpriteLayer; 30 class CrushedSpriteLayer;
(...skipping 11 matching lines...) Expand all
42 int panel_icon_resource_id, 42 int panel_icon_resource_id,
43 int search_provider_icon_sprite_metadata_resource_id, 43 int search_provider_icon_sprite_metadata_resource_id,
44 int arrow_up_resource_id, 44 int arrow_up_resource_id,
45 int close_icon_resource_id, 45 int close_icon_resource_id,
46 int progress_bar_background_resource_id, 46 int progress_bar_background_resource_id,
47 int progress_bar_resource_id, 47 int progress_bar_resource_id,
48 int search_promo_resource_id, 48 int search_promo_resource_id,
49 int peek_promo_ripple_resource_id, 49 int peek_promo_ripple_resource_id,
50 int peek_promo_text_resource_id, 50 int peek_promo_text_resource_id,
51 float dp_to_px, 51 float dp_to_px,
52 content::ContentViewCore* content_view_core, 52 scoped_refptr<cc::Layer> content_layer,
no sievers 2016/07/12 23:44:16 nit: scoped_refptr const-ref here and elsewhere
mdjones 2016/07/13 00:21:31 Done.
53 bool search_promo_visible, 53 bool search_promo_visible,
54 float search_promo_height, 54 float search_promo_height,
55 float search_promo_opacity, 55 float search_promo_opacity,
56 bool search_peek_promo_visible, 56 bool search_peek_promo_visible,
57 float search_peek_promo_height, 57 float search_peek_promo_height,
58 float search_peek_promo_padding, 58 float search_peek_promo_padding,
59 float search_peek_promo_ripple_width, 59 float search_peek_promo_ripple_width,
60 float search_peek_promo_ripple_opacity, 60 float search_peek_promo_ripple_opacity,
61 float search_peek_promo_text_opacity, 61 float search_peek_promo_text_opacity,
62 float search_panel_x, 62 float search_panel_x,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 scoped_refptr<cc::UIResourceLayer> peek_promo_text_; 103 scoped_refptr<cc::UIResourceLayer> peek_promo_text_;
104 scoped_refptr<cc::NinePatchLayer> progress_bar_; 104 scoped_refptr<cc::NinePatchLayer> progress_bar_;
105 scoped_refptr<cc::NinePatchLayer> progress_bar_background_; 105 scoped_refptr<cc::NinePatchLayer> progress_bar_background_;
106 scoped_refptr<cc::UIResourceLayer> search_caption_; 106 scoped_refptr<cc::UIResourceLayer> search_caption_;
107 }; 107 };
108 108
109 } // namespace android 109 } // namespace android
110 } // namespace chrome 110 } // namespace chrome
111 111
112 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_ 112 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698