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

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

Issue 1417793003: OverlayPanel Manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-delegate-users
Patch Set: redundant null checks... Created 5 years, 1 month 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/contextualsearch/ContextualSearchPanel.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
index 45c795d27a81794679417bdfde7b7cf3c8f44c0c..299728c1b025bcef7925dddd7a087aa2256a326e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
@@ -12,6 +12,8 @@ import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.compositor.bottombar.OverlayContentProgressObserver;
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelContent;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager.PanelPriority;
import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
import org.chromium.chrome.browser.compositor.scene_layer.ContextualSearchSceneLayer;
import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
@@ -67,9 +69,11 @@ public class ContextualSearchPanel extends OverlayPanel {
/**
* @param context The current Android {@link Context}.
* @param updateHost The {@link LayoutUpdateHost} used to request updates in the Layout.
+ * @param panelManager The object managing the how different panels are shown.
*/
- public ContextualSearchPanel(Context context, LayoutUpdateHost updateHost) {
- super(context, updateHost);
+ public ContextualSearchPanel(Context context, LayoutUpdateHost updateHost,
+ OverlayPanelManager panelManager) {
+ super(context, updateHost, panelManager);
mSceneLayer = createNewContextualSearchSceneLayer();
mPanelMetrics = new ContextualSearchPanelMetrics();
}
@@ -301,6 +305,22 @@ public class ContextualSearchPanel extends OverlayPanel {
}
// ============================================================================================
+ // Panel base methods
+ // ============================================================================================
+
+ @Override
+ public PanelPriority getPriority() {
+ return PanelPriority.HIGH;
+ }
+
+ @Override
+ public boolean canBeSuppressed() {
+ // The selected text on the page is lost when the panel is closed, thus, this panel cannot
+ // be restored if it is suppressed.
+ return false;
+ }
+
+ // ============================================================================================
// Animation Handling
// ============================================================================================
@@ -696,25 +716,12 @@ public class ContextualSearchPanel extends OverlayPanel {
// Panel Content
// ============================================================================================
- // TODO(pedrosimonetti): move content code to its own section.
-
- /**
- * Acknowledges that there was a touch in the search content view, though no immediate action
- * needs to be taken.
- * TODO(mdjones): Get a better name for this.
- */
+ @Override
public void onTouchSearchContentViewAck() {
mHasContentBeenTouched = true;
}
/**
- * Notify the panel that it's content has been touched.
- */
- public void notifyPanelTouched() {
- getOverlayPanelContent().notifyPanelTouched();
- }
-
- /**
* Destroy the current content in the panel.
* NOTE(mdjones): This should not be exposed. The only use is in ContextualSearchManager for a
* bug related to loading new panel content.

Powered by Google App Engine
This is Rietveld 408576698