[OSX, OmniTheatre] URL hiding for Origin Chip.

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

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
@@ skipping 381 matching lines @@
 - (void)mouseEntered:(NSEvent*)event {
   [self mouseMoved:event];
 }
 
 - (LocationBarViewMac*)locationBarBridge {
   return locationBarView_.get();
 }
 
 - (void)focusLocationBar:(BOOL)selectAll {
   if (locationBarView_.get()) {
-    if (chrome::ShouldDisplayOriginChip() && selectAll) {
+    if (selectAll &&
+        locationBarView_->GetToolbarModel()->WouldOmitURLDueToOriginChip()) {
       // 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);
     }
   }
 }
@@ skipping 415 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end