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

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

Issue 2241643003: Fix a bug that some NativePage might overlap tabstrip on tablets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index 6cb24acce5fe216154c2193b521fc69d5e54f24c..d472824e5c333fb9fc7901a4f1a8664cf31335c9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -203,13 +203,13 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
private TabContentViewParent mContentViewParent;
/** A list of Tab observers. These are used to broadcast Tab events to listeners. */
- private final ObserverList<TabObserver> mObservers = new ObserverList<TabObserver>();
+ private final ObserverList<TabObserver> mObservers = new ObserverList<>();
/**
* A list of {@link ContentViewCore} overlay objects that are managed by external components but
* need to be sized and rendered along side this {@link Tab}s content.
*/
- private final List<ContentViewCore> mOverlayContentViewCores = new ArrayList<ContentViewCore>();
+ private final List<ContentViewCore> mOverlayContentViewCores = new ArrayList<>();
// Content layer Observers and Delegates
private ContentViewClient mContentViewClient;
@@ -873,12 +873,11 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
}
/**
- * @return The {@link View} displaying the current page in the tab. This might be a
- * native view or a placeholder view for content rendered by the compositor.
- * This can be {@code null}, if the tab is frozen or being initialized or destroyed.
+ * @return The {@link View} displaying the current page in the tab. This can be {@code null}, if
+ * the tab is frozen or being initialized or destroyed.
*/
public View getView() {
- return mNativePage != null ? mNativePage.getView() : mContentViewParent;
+ return mContentViewParent;
}
/**

Powered by Google App Engine
This is Rietveld 408576698