[Home] Add some NTP UI polish

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.omnibox;
 
 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS;
 
 import android.Manifest;
 import android.animation.Animator;
@@ skipping 1088 matching lines @@
 
         updateOmniboxResultsContainer();
         if (hasFocus) updateFadingBackgroundView(true);
     }
 
     /**
      * Make a zero suggest request if:
      * - Native is loaded.
      * - The URL bar has focus.
      * - The current tab is not incognito.
-     * - Chrome Home is disabled.
      */
     private void startZeroSuggest() {
         // Reset "edited" state in the omnibox if zero suggest is triggered -- new edits
         // now count as a new session.
         mHasStartedNewOmniboxEditSession = false;
         mNewOmniboxEditSessionTimestamp = -1;
         Tab currentTab = getCurrentTab();
         if (mNativeInitialized && mUrlHasFocus && currentTab != null) {
             mAutocomplete.startZeroSuggest(currentTab.getProfile(),
                     mUrlBar.getTextWithAutocomplete(), mToolbarDataProvider.getCurrentUrl(),
@@ skipping 24 matching lines @@
             startZeroSuggest();
         } else {
             assert mRequestSuggestions == null : "Multiple omnibox requests in flight.";
             mRequestSuggestions = new Runnable() {
                 @Override
                 public void run() {
                     String textWithoutAutocomplete = mUrlBar.getTextWithoutAutocomplete();
 
                     boolean preventAutocomplete = textDeleted || !mUrlBar.shouldAutocomplete();
                     mRequestSuggestions = null;
-                    if (getCurrentTab() == null) return;
-                    mAutocomplete.start(
-                            getCurrentTab().getProfile(),
-                            getCurrentTab().getUrl(),
-                            textWithoutAutocomplete, preventAutocomplete);
+
+                    if (getCurrentTab() == null
+                            && (mBottomSheet == null || mToolbarDataProvider.isIncognito())) {
+                        return;
+                    }
+
+                    // If the bottom sheet is not null, the current tab will be null when the
+                    // NTP UI is showing. Use the original profile rather than the tab profile
+                    // in that scenario.
+                    Profile profile = getCurrentTab() != null
+                            ? getCurrentTab().getProfile()
+                            : Profile.getLastUsedProfile().getOriginalProfile();
+                    String url = getCurrentTab() != null ? getCurrentTab().getUrl()
+                                                         : UrlConstants.NTP_URL;
+                    mAutocomplete.start(profile, url, textWithoutAutocomplete, preventAutocomplete);
                 }
             };
             if (mNativeInitialized) {
                 postDelayed(mRequestSuggestions, OMNIBOX_SUGGESTION_START_DELAY_MS);
             } else {
                 mDeferredNativeRunnables.add(mRequestSuggestions);
             }
         }
 
         // Occasionally, was seeing the selection in the URL not being cleared during
@@ skipping 698 matching lines @@
             return;
         }
 
         setUrlBarText(query, null);
         mUrlBar.setSelection(0, mUrlBar.getText().length());
         setUrlBarFocus(true);
         stopAutocomplete(false);
         if (getCurrentTab() != null) {
             mAutocomplete.start(
                     getCurrentTab().getProfile(), getCurrentTab().getUrl(), query, false);
+        } else if (mBottomSheet != null && !mToolbarDataProvider.isIncognito()) {
+            mAutocomplete.start(Profile.getLastUsedProfile().getOriginalProfile(),
+                    UrlConstants.NTP_URL, query, false);
         }
         post(new Runnable() {
             @Override
             public void run() {
                 UiUtils.showKeyboard(mUrlBar);
             }
         });
     }
 
     /**
@@ skipping 117 matching lines @@
             } else {
                 postDelayed(mShowSuggestions, ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS);
             }
         }
 
         // Update the navigation button to show the default suggestion's icon.
         updateNavigationButton();
 
         if (mNativeInitialized
                 && !CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_INSTANT)
-                && PrivacyPreferencesManager.getInstance().shouldPrerender()) {
+                && PrivacyPreferencesManager.getInstance().shouldPrerender()
+                && getCurrentTab() != null) {
             mOmniboxPrerender.prerenderMaybe(
                     userText,
                     getOriginalUrl(),
                     mAutocomplete.getCurrentNativeAutocompleteResult(),
                     getCurrentTab().getProfile(),
                     getCurrentTab());
         }
     }
 
     @Override
@@ skipping 487 matching lines @@
     public void setTitleToPageTitle() { }
 
     @Override
     public void setShowTitle(boolean showTitle) { }
 
     @Override
     public boolean mustQueryUrlBarLocationForSuggestions() {
         return DeviceFormFactor.isTablet();
     }
 }