Commit 4037935c authored by Ted Choc's avatar Ted Choc Committed by Commit Bot

Extract OmniboxSuggestionsList from LocationBarLayout.

BUG=843596

Change-Id: I4846edc879c2b913ba558cbfb7884836d398aabc
Reviewed-on: https://chromium-review.googlesource.com/1062018Reviewed-by: default avatarMaria Khomenko <mariakhomenko@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559179}
parent 5bf18bf2
......@@ -852,6 +852,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java",
"java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java",
"java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestion.java",
"java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestionsList.java",
"java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java",
"java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java",
"java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java",
......
......@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.omnibox.AutocompleteController.OnSuggestionsReceivedListener;
import org.chromium.chrome.browser.omnibox.LocationBarLayout.OmniboxSuggestionsList;
import org.chromium.chrome.browser.tab.EmptyTabObserver;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabObserver;
......
......@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.omnibox.LocationBarLayout;
import org.chromium.chrome.browser.omnibox.MatchClassificationStyle;
import org.chromium.chrome.browser.omnibox.OmniboxSuggestion;
import org.chromium.chrome.browser.omnibox.OmniboxSuggestion.MatchClassification;
import org.chromium.chrome.browser.omnibox.OmniboxSuggestionsList;
import org.chromium.chrome.browser.omnibox.UrlBar;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.content.browser.test.util.Criteria;
......@@ -332,8 +333,7 @@ public class OmniboxTestUtils {
CriteriaHelper.pollUiThread(new Criteria() {
@Override
public boolean isSatisfied() {
LocationBarLayout.OmniboxSuggestionsList suggestionsList =
locationBar.getSuggestionList();
OmniboxSuggestionsList suggestionsList = locationBar.getSuggestionList();
if (suggestionsList == null) {
updateFailureReason("suggestionList is null");
return false;
......@@ -361,8 +361,7 @@ public class OmniboxTestUtils {
CriteriaHelper.pollUiThread(new Criteria() {
@Override
public boolean isSatisfied() {
LocationBarLayout.OmniboxSuggestionsList suggestionsList =
locationBar.getSuggestionList();
OmniboxSuggestionsList suggestionsList = locationBar.getSuggestionList();
return suggestionsList != null
&& suggestionsList.isShown()
&& suggestionsList.getCount() == expectedCount;
......
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