removing ShouldHideTopMatch

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 
 #include <cmath>
 
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 57 matching lines @@
   [matrix_ setObserver:NULL];
 }
 
 bool OmniboxPopupViewMac::IsOpen() const {
   return popup_ != nil;
 }
 
 void OmniboxPopupViewMac::UpdatePopupAppearance() {
   DCHECK([NSThread isMainThread]);
   const AutocompleteResult& result = GetResult();
-  const size_t start_match = result.ShouldHideTopMatch() ? 1 : 0;
-  const size_t rows = result.size() - start_match;
+  const size_t rows = result.size();
   if (rows == 0) {
     [[popup_ parentWindow] removeChildWindow:popup_];
     [popup_ orderOut:nil];
 
     // Break references to |this| because the popup may not be
     // deallocated immediately.
     [matrix_ setDelegate:nil];
     matrix_.reset();
 
     popup_.reset(nil);
@@ skipping 10 matching lines @@
   const CGFloat matrix_width = NSWidth([field_ bounds]);
   DCHECK_GT(matrix_width, 0.0);
 
   // Load the results into the popup's matrix.
   DCHECK_GT(rows, 0U);
   [matrix_ renewRows:rows columns:1];
   CGFloat max_match_contents_width = 0.0f;
   CGFloat contents_offset = -1.0f;
   for (size_t ii = 0; ii < rows; ++ii) {
     OmniboxPopupCell* cell = [matrix_ cellAtRow:ii column:0];
-    const AutocompleteMatch& match = GetResult().match_at(ii + start_match);
+    const AutocompleteMatch& match = GetResult().match_at(ii);
     [cell setImage:ImageForMatch(match)];
     [cell setMatch:match];
     // Only set the image on the one cell with match.answer.
     if (match.answer && !model_->answer_bitmap().isNull()) {
       NSImage* image =
           gfx::Image::CreateFrom1xBitmap(model_->answer_bitmap()).CopyNSImage();
       [cell setAnswerImage:image];
     }
     if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL) {
       max_match_contents_width = std::max(max_match_contents_width,
@@ skipping 33 matching lines @@
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   NSRect monitor_frame = [screen frame];
   gfx::Rect bounds(NSRectToCGRect(target_popup_frame_));
   bounds.set_y(monitor_frame.size.height - bounds.y() - bounds.height());
   return bounds;
 }
 
 // This is only called by model in SetSelectedLine() after updating
 // everything.  Popup should already be visible.
 void OmniboxPopupViewMac::PaintUpdatesNow() {
-  size_t start_match = model_->result().ShouldHideTopMatch() ? 1 : 0;
-  if (start_match > model_->selected_line()) {
-    [matrix_ deselectAllCells];
-  } else {
-    [matrix_ selectCellAtRow:model_->selected_line() - start_match column:0];
-  }
-
+  [matrix_ selectCellAtRow:model_->selected_line() column:0];
 }
 
 void OmniboxPopupViewMac::OnMatrixRowSelected(OmniboxPopupMatrix* matrix,
                                               size_t row) {
-  size_t start_match = model_->result().ShouldHideTopMatch() ? 1 : 0;
-  model_->SetSelectedLine(row + start_match, false, false);
+  model_->SetSelectedLine(row, false, false);
 }
 
 void OmniboxPopupViewMac::OnMatrixRowClicked(OmniboxPopupMatrix* matrix,
                                              size_t row) {
   OpenURLForRow(row,
                 ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]));
 }
 
 void OmniboxPopupViewMac::OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix,
                                                    size_t row) {
@@ skipping 142 matching lines @@
   if (!image.IsEmpty())
     return image.AsNSImage();
 
   const int resource_id = model_->IsStarredMatch(match) ?
       IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type);
   return OmniboxViewMac::ImageForResource(resource_id);
 }
 
 void OmniboxPopupViewMac::OpenURLForRow(size_t row,
                                         WindowOpenDisposition disposition) {
-  size_t start_match = model_->result().ShouldHideTopMatch() ? 1 : 0;
-  row += start_match;
   DCHECK_LT(row, GetResult().size());
   omnibox_view_->OpenMatch(GetResult().match_at(row), disposition, GURL(),
                            base::string16(), row);
 }