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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/EmbedContentViewActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 9c05eacd70ef5b5aaebb47711ff745a50d49a17e..da127fec28f0805c4f296f65f5837300c719e540 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -1271,7 +1271,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
* manager.
* @return A {@link ChromeFullscreenManager} instance that's been created.
*/
- protected ChromeFullscreenManager createFullscreenManager(View controlContainer) {
+ protected ChromeFullscreenManager createFullscreenManager(ControlContainer controlContainer) {
return new ChromeFullscreenManager(this, controlContainer, getTabModelSelector(),
getControlContainerHeightResource(), true);
}
@@ -1310,7 +1310,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
LayoutManagerDocument layoutManager, View urlBar, ViewGroup contentContainer,
ControlContainer controlContainer) {
if (controlContainer != null) {
- mFullscreenManager = createFullscreenManager((View) controlContainer);
+ mFullscreenManager = createFullscreenManager(controlContainer);
}
if (mContextualSearchManager != null) {
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/EmbedContentViewActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698