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

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

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 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 db5aaaeb49dd2a0746d127c28faf6ecbff0c249c..8ff2b3b07bad1c7c7e58c5c9f22810ba2ea029b9 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
@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager.PanelPriority;
import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPromoControl.ContextualSearchPromoHost;
import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeEventFilter.ScrollDirection;
import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilterHost;
import org.chromium.chrome.browser.compositor.scene_layer.ContextualSearchSceneLayer;
import org.chromium.chrome.browser.compositor.scene_layer.SceneOverlayLayer;
@@ -284,6 +285,8 @@ public class ContextualSearchPanel extends OverlayPanel {
*/
@Override
public void handleBarClick(long time, float x, float y) {
+ getSearchBarControl().onSearchBarClick(x);
+
if (isPeeking()) {
if (getSearchBarControl().getQuickActionControl().hasQuickAction()
&& isCoordinateInsideActionTarget(x)) {
@@ -323,6 +326,30 @@ public class ContextualSearchPanel extends OverlayPanel {
return false;
}
+ @Override
+ public void drag(float x, float y, float deltaX, float deltaY, float tx, float ty) {
+ getSearchBarControl().onScroll();
+ super.drag(x, y, deltaX, deltaY, tx, ty);
+ }
+
+ @Override
+ public void swipeStarted(ScrollDirection direction, float x, float y) {
+ getSearchBarControl().onScroll();
+ super.swipeStarted(direction, x, y);
+ }
+
+ @Override
+ public void onShowPress(float x, float y) {
+ if (isCoordinateInsideBar(x, y)) getSearchBarControl().onShowPress(x);
+ super.onShowPress(x, y);
+ }
+
+ @Override
+ public void onLongPress(float x, float y) {
+ if (isCoordinateInsideBar(x, y)) getSearchBarControl().onLongPress();
+ super.onLongPress(x, y);
+ }
+
// ============================================================================================
// Panel base methods
// ============================================================================================

Powered by Google App Engine
This is Rietveld 408576698