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

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

Issue 1716653002: Implement OverlayPanels as SceneOverlays (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevent native call in test 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
Index: chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java
index b65a09403773b713a6d78a81dc938298ac4ec84e..385479e3b2e121b9c0082d4deaac077a504e45b2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java
@@ -32,29 +32,18 @@ public class OverlayPanelManagerTest extends InstrumentationTestCase {
private PanelPriority mPriority;
private boolean mCanBeSuppressed;
- private OverlayPanelHost mHost;
private ViewGroup mContainerView;
private DynamicResourceLoader mResourceLoader;
public MockOverlayPanel(Context context, LayoutUpdateHost updateHost,
OverlayPanelManager panelManager, PanelPriority priority,
boolean canBeSuppressed) {
- super(context, updateHost, panelManager);
+ super(context, updateHost, null, panelManager);
mPriority = priority;
mCanBeSuppressed = canBeSuppressed;
}
@Override
- public void setHost(OverlayPanelHost host) {
- super.setHost(host);
- mHost = host;
- }
-
- public OverlayPanelHost getHost() {
- return mHost;
- }
-
- @Override
public void setContainerView(ViewGroup container) {
super.setContainerView(container);
mContainerView = container;
@@ -222,22 +211,13 @@ public class OverlayPanelManagerTest extends InstrumentationTestCase {
MockOverlayPanel earlyPanel =
new MockOverlayPanel(context, null, panelManager, PanelPriority.MEDIUM, true);
- OverlayPanelHost host = new OverlayPanelHost() {
- @Override
- public void hideLayout(boolean immediately) {
- // Intentionally do nothing.
- }
- };
-
// Set necessary vars before any other panels are registered in the manager.
- panelManager.setPanelHost(host);
panelManager.setContainerView(new LinearLayout(getInstrumentation().getTargetContext()));
panelManager.setDynamicResourceLoader(new DynamicResourceLoader(0, null));
MockOverlayPanel latePanel =
new MockOverlayPanel(context, null, panelManager, PanelPriority.MEDIUM, true);
- assertTrue(earlyPanel.getHost() == latePanel.getHost());
assertTrue(earlyPanel.getContainerView() == latePanel.getContainerView());
assertTrue(earlyPanel.getDynamicResourceLoader() == latePanel.getDynamicResourceLoader());
}

Powered by Google App Engine
This is Rietveld 408576698