Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
index 157f36f3c96e8228dae9b8a537933292104bd242..0eaa723a92b7f28bf5814a452d65e138059102f6 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost; |
import org.chromium.chrome.browser.ntp.NewTabPage; |
import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper; |
import org.chromium.chrome.browser.omnibox.LocationBar; |
+import org.chromium.chrome.browser.omnibox.UrlContainer; |
import org.chromium.chrome.browser.tab.Tab; |
import org.chromium.chrome.browser.util.ViewUtils; |
import org.chromium.chrome.browser.widget.TintedImageButton; |
@@ -38,6 +39,8 @@ import org.chromium.chrome.browser.widget.ToolbarProgressBar; |
import org.chromium.ui.UiUtils; |
import org.chromium.ui.widget.Toast; |
+import javax.annotation.Nullable; |
+ |
/** |
* Layout class that contains the base shared logic for manipulating the toolbar component. For |
* interaction that are not from Views inside Toolbar hierarchy all interactions should be done |
@@ -56,6 +59,8 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
protected TintedImageButton mMenuButton; |
protected ImageView mMenuBadge; |
protected View mMenuButtonWrapper; |
+ @Nullable |
+ private UrlContainer mUrlContainer; |
private AppMenuButtonHelper mAppMenuButtonHelper; |
protected final ColorStateList mDarkModeTint; |
@@ -63,6 +68,7 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
private ToolbarDataProvider mToolbarDataProvider; |
private ToolbarTabController mToolbarTabController; |
+ @Nullable |
private ToolbarProgressBar mProgressBar; |
private boolean mNativeLibraryReady; |
@@ -107,6 +113,8 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
mMenuBadge = (ImageView) findViewById(R.id.menu_badge); |
mMenuButtonWrapper = findViewById(R.id.menu_button_wrapper); |
+ mUrlContainer = (UrlContainer) findViewById(R.id.url_container); |
+ |
// Initialize the provider to an empty version to avoid null checking everywhere. |
mToolbarDataProvider = new ToolbarDataProvider() { |
@Override |
@@ -546,6 +554,7 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
* Notified when a navigation to a different page has occurred. |
*/ |
protected void onNavigatedToDifferentPage() { |
+ if (mUrlContainer != null) mUrlContainer.setTrailingTextVisible(true); |
} |
/** |
@@ -576,6 +585,7 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
if (mProgressBar != null) { |
mProgressBar.finish(delayed); |
} |
+ if (mUrlContainer != null) mUrlContainer.setTrailingTextVisible(false); |
} |
/** |