removing ShouldHideTopMatch

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
index 7d6011bbd6f0f3e17925080331407241093b8a20..44ff7e22ca0d38d8f0d1b02f4306c554fe214a62 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
@@ -75,8 +75,7 @@ bool OmniboxPopupViewMac::IsOpen() const {
 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];
@@ -107,7 +106,7 @@ void OmniboxPopupViewMac::UpdatePopupAppearance() {
   CGFloat contents_offset = -1.0f;
   for (size_t ii = 0; ii < rows; ++ii) {

[groby-ooo-7-16, 2015/05/29 20:46:04]

Personal nit: I think a range-based loop would be slightly clearer (plus, death
to ii! ;)
  NSInteger row = 0;
  for (auto const AutocompleteMatch& match : result) {
    OmniboxPopupCell* cell = [matrix_ cellAtRow:row++ column:0];
    [cell setImage:ImageForMatch(match)];
... and so on.

If you don't use that, please do replace GetResult() below with |result|

     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.
@@ -161,19 +160,12 @@ gfx::Rect OmniboxPopupViewMac::GetTargetBounds() {
 // 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,
@@ -336,8 +328,6 @@ NSImage* OmniboxPopupViewMac::ImageForMatch(const AutocompleteMatch& match) {
 
 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);