chrome/browser/android/compositor/compositor_view.h - Issue 1706293005: StaticTabSceneLayer owns ToolbarLayer

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/compositor_view.h

Issue 1706293005: StaticTabSceneLayer owns ToolbarLayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix findbugs issue Created 4 years, 7 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/android/java/src/org/chromium/chrome/browser/widget/ControlContainer.java ('k') | chrome/browser/android/compositor/compositor_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/compositor/compositor_view.h

diff --git a/chrome/browser/android/compositor/compositor_view.h b/chrome/browser/android/compositor/compositor_view.h

index ab0a2f71c4eb1619bfb91f0f6fe772aa5c8cab6c..30689139fea1c5a11cd68ab7efe3b4fbe71b82c9 100644

--- a/chrome/browser/android/compositor/compositor_view.h

+++ b/chrome/browser/android/compositor/compositor_view.h

@@ -82,29 +82,6 @@ class CompositorView : public content::CompositorClient,

jfloat visible_x_offset,

jfloat visible_y_offset,

jfloat dp_to_pixel);

- void UpdateToolbarLayer(JNIEnv* env,

- const base::android::JavaParamRef<jobject>& object,

- jint toolbar_resource_id,

- jint toolbar_background_color,

- jint url_bar_resource_id,

- jfloat url_bar_alpha,

- jfloat top_offset,

- jfloat brightness,

- bool visible,

- bool show_shadow);

- void UpdateProgressBar(JNIEnv* env,

- const base::android::JavaParamRef<jobject>& object,

- jint progress_bar_x,

- jint progress_bar_y,

- jint progress_bar_width,

- jint progress_bar_height,

- jint progress_bar_color,

- jint progress_bar_background_x,

- jint progress_bar_background_y,

- jint progress_bar_background_width,

- jint progress_bar_background_height,

- jint progress_bar_background_color);

void SurfaceCreated(JNIEnv* env,

const base::android::JavaParamRef<jobject>& object);

void SurfaceDestroyed(JNIEnv* env,

@@ -145,7 +122,6 @@ class CompositorView : public content::CompositorClient,

TabContentManager* tab_content_manager_;

scoped_refptr<cc::SolidColorLayer> root_layer_;

- scoped_refptr<ToolbarLayer> toolbar_layer_;

SceneLayer* scene_layer_;

scoped_refptr<cc::Layer> scene_layer_layer_;