Commit 04aa516a authored by Siddhartha's avatar Siddhartha Committed by Commit Bot

Fix OverviewListLayoutTest for chrome modern

Change-Id: I1f9f3f47933ef13a0a69f999e7ddd2b021affa16
Reviewed-on: https://chromium-review.googlesource.com/1177197Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Siddhartha S <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583667}
parent 0978be96
...@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutTab; ...@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutTab;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver; import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModel;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.chrome.browser.widget.accessibility.AccessibilityTabModelListItem; import org.chromium.chrome.browser.widget.accessibility.AccessibilityTabModelListItem;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ChromeTabbedActivityTestRule; import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
...@@ -149,8 +150,12 @@ public class OverviewListLayoutTest { ...@@ -149,8 +150,12 @@ public class OverviewListLayoutTest {
private CharSequence getTabTitleOfListItem(int index) { private CharSequence getTabTitleOfListItem(int index) {
View childView = getListItem(index); View childView = getListItem(index);
TextView childTextView = TextView childTextView;
(TextView) childView.findViewById(org.chromium.chrome.R.id.tab_title); if (FeatureUtilities.isChromeModernDesignEnabled()) {
childTextView = (TextView) childView.findViewById(org.chromium.chrome.R.id.title);
} else {
childTextView = (TextView) childView.findViewById(org.chromium.chrome.R.id.tab_title);
}
return childTextView.getText(); return childTextView.getText();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment