[Modern] Transition to default theme color when focusing omnibox

BUG=803098

Change-Id: I18537d5a844368a694bbb292a98a94da735c6bfb
Reviewed-on: https://chromium-review.googlesource.com/900100
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534851}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

@@ -1112,6 +1112,19 @@ public class ToolbarPhone extends ToolbarLayout
                 isLocationBarRtl, locationBarBaseTranslationX));
         mLocationBar.setUrlFocusChangePercent(mUrlExpansionPercent);
 
+        if (mLocationBar.useModernDesign()) {
+            int defaultColor = ColorUtils.getDefaultThemeColor(getResources(), true, isIncognito());
+            int defaultLocationBarColor = getLocationBarColorForToolbarColor(defaultColor);
+            int primaryColor = getToolbarDataProvider().getPrimaryColor();
+            int themedLocationBarColor = getLocationBarColorForToolbarColor(primaryColor);
+
+            updateToolbarBackground(ColorUtils.getColorWithOverlay(
+                    primaryColor, defaultColor, mUrlFocusChangePercent));
+
+            updateModernLocationBarColor(ColorUtils.getColorWithOverlay(
+                    themedLocationBarColor, defaultLocationBarColor, mUrlFocusChangePercent));
+        }
+
         // Force an invalidation of the location bar to properly handle the clipping of the URL
         // bar text as a result of the URL action container translations.
         mLocationBar.invalidate();