[OriginChip, OSX] Show & select URL on cmd-l.

This is reflecting the Views change made in r240444 and is specific to
the OriginChip being enabled.

BUG=315944
R=shess@chromium.org

Review URL: https://codereview.chromium.org/138983004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251197 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -398,8 +398,17 @@ class NotificationBridge
 }
 
 - (void)focusLocationBar:(BOOL)selectAll {
-  if (locationBarView_.get())
-    locationBarView_->FocusLocation(selectAll ? true : false);
+  if (locationBarView_.get()) {
+    if (chrome::ShouldDisplayOriginChip() && selectAll) {
+      // select_all is true when it's expected that the user may want to copy
+      // the URL to the clipboard. If the origin chip is being displayed (and
+      // thus the URL is not being shown in the Omnibox) show it now to support
+      // the same functionality.
+      locationBarView_->GetOmniboxView()->ShowURL();
+    } else {
+      locationBarView_->FocusLocation(selectAll ? true : false);
+    }
+  }
 }
 
 // Called when the state for a command changes to |enabled|. Update the