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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

Issue 1372963005: Separate ContextualSearchPanel from OverlayPanel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rebase-extract-management-delegate
Patch Set: fix redundant null check Created 5 years, 2 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/compositor/bottombar/OverlayPanelContent.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
index 5d5a4216b1e141e82d24a66ad82b4738c30c789c..3d74cb934588cbd29a339a7ba551c25aa2a8e1b3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
@@ -21,7 +21,9 @@ import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.browser.WebContentsObserver;
/**
- * Controls the Contextual Search Panel.
+ * Content container for an OverlayPanel. This class is responsible for the management of the
+ * ContentViewCore displayed inside of a panel and exposes a simple API relevant to actions a
+ * panel has.
*/
public class OverlayPanelContent {
@@ -165,7 +167,6 @@ public class OverlayPanelContent {
destroyContentView();
}
- System.out.println("ctxs --- OverlayPanelContent.createNewContentView");
mContentViewCore = new ContentViewCore(mActivity);
if (mContentViewClient == null) {
@@ -227,7 +228,6 @@ public class OverlayPanelContent {
*/
private void destroyContentView() {
if (mContentViewCore != null) {
- System.out.println("ctxs --- OverlayPanelContent.destroyContentView");
nativeDestroyWebContents(mNativeOverlayPanelContentPtr);
mContentViewCore.getWebContents().destroy();
mContentViewCore.destroy();
@@ -260,7 +260,6 @@ public class OverlayPanelContent {
* @param url The URL that should be loaded.
*/
public void loadUrl(String url) {
- System.out.println("ctxs --- OverlayPanelContent.loadUrl");
createNewContentView();
if (mContentViewCore != null && mContentViewCore.getWebContents() != null) {
@@ -316,7 +315,7 @@ public class OverlayPanelContent {
/**
* @return The Y scroll position.
*/
- public float getContentViewVerticalScroll() {
+ public float getContentVerticalScroll() {
return mContentViewCore != null
? mContentViewCore.computeVerticalScrollOffset() : -1.f;
}
@@ -342,7 +341,6 @@ public class OverlayPanelContent {
// your Web History (if enabled). For this reason, onShow() should only be called
// when we know for sure the page will be seen by the user.
if (mContentViewCore != null) mContentViewCore.onShow();
- if (mContentViewCore != null) System.out.println("ctxs --- mContentViewCore.onShow");
mContentDelegate.onContentViewSeen();
} else {
@@ -373,7 +371,7 @@ public class OverlayPanelContent {
/**
* @return true if the ContentViewCore is visible on the page.
*/
- public boolean isContentViewShowing() {
+ public boolean isContentShowing() {
return mIsContentViewShowing;
}

Powered by Google App Engine
This is Rietveld 408576698