Remove OriginChip code.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 985 matching lines @@
   // top-of-window views revealed.
   scoped_ptr<ImmersiveRevealedLock> focus_reveal_lock(
       immersive_mode_controller_->GetRevealedLock(
           ImmersiveModeController::ANIMATE_REVEAL_YES));
 
   LocationBarView* location_bar = GetLocationBarView();
   if (location_bar->omnibox_view()->IsFocusable()) {
     // Location bar got focus.
     //
     // select_all is true when it's expected that the user may want to copy
-    // the URL to the clipboard. If the URL is not being shown because the
-    // origin chip is enabled, show it now to support the same functionality.
-    if (select_all &&
-        location_bar->GetToolbarModel()->WouldOmitURLDueToOriginChip())
+    // the URL to the clipboard.
+    if (select_all)

[Justin Donnelly, 2014/11/21 19:15:24]

If we get rid of the search button then these few lines can revert to their
original state, which is just the one line in the else clause.

See
https://codereview.chromium.org/111873004/diff/40001/chrome/browser/ui/views/...
for the original change.

[groby-ooo-7-16, 2014/12/02 18:40:10]

We can get rid of them even without the search button, since it only depends on
WouldOmitDueToOriginChip.

Either way, I'll have a pipelined CL for the search button - I'm happy to submit
both combined into one, once they're reviewed, but I figured I make it a tad
easier on the reviewers :)

       location_bar->ShowURL();
     else
       location_bar->FocusLocation(select_all);
   } else {
     // If none of location bar got focus, then clear focus.
     views::FocusManager* focus_manager = GetFocusManager();
     DCHECK(focus_manager);
     focus_manager->ClearFocus();
   }
 }
@@ skipping 1485 matching lines @@
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(nullptr));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }