chrome/browser/android/compositor/layer/contextual_search_layer.cc - Issue 2142263002: Remove ContentViewCore dependency from OverlayPanel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/compositor/layer/contextual_search_layer.cc

Issue 2142263002: Remove ContentViewCore dependency from OverlayPanel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: var name 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/compositor/layer/contextual_search_layer.h ('k') | chrome/browser/android/compositor/layer/overlay_panel_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/compositor/layer/contextual_search_layer.cc

diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.cc b/chrome/browser/android/compositor/layer/contextual_search_layer.cc

index 07d716a1db5642085d6635f647e8a38d4481fdd0..eee52f3ff39cd9243bc66ad3208676ca865e2257 100644

--- a/chrome/browser/android/compositor/layer/contextual_search_layer.cc

+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.cc

@@ -11,7 +11,6 @@

#include "cc/resources/scoped_ui_resource.h"

#include "chrome/browser/android/compositor/layer/crushed_sprite_layer.h"

#include "content/public/browser/android/compositor.h"

-#include "content/public/browser/android/content_view_core.h"

#include "third_party/skia/include/core/SkColor.h"

#include "ui/android/resources/crushed_sprite_resource.h"

#include "ui/android/resources/resource_manager.h"

@@ -77,7 +76,7 @@ void ContextualSearchLayer::SetProperties(

int peek_promo_ripple_resource_id,

int peek_promo_text_resource_id,

float dp_to_px,

- content::ContentViewCore* content_view_core,

+ const scoped_refptr<cc::Layer>& content_layer,

bool search_promo_visible,

float search_promo_height,

float search_promo_opacity,

@@ -146,7 +145,7 @@ void ContextualSearchLayer::SetProperties(

// -----------------------------------------------------------------

OverlayPanelLayer::SetProperties(

dp_to_px,

- content_view_core,

+ content_layer,

content_view_top,

search_panel_x,

search_panel_y,