[AiS] changing mac omnibox suggestions form NSMatrix to NSTableView

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

 // Copyright 2013 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/omnibox/omnibox_popup_cell.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/i18n/rtl.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/suggestion_answer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
 
 namespace {
 
+// How much to adjust the cell sizing up from the default determined
+// by the font.
+const CGFloat kCellHeightAdjust = 6.0;
+
 // How far to offset image column from the left.
 const CGFloat kImageXOffset = 5.0;
 
 // How far to offset the text column from the left.
 const CGFloat kTextStartOffset = 28.0;
 
 // Rounding radius of selection and hover background on popup items.
 const CGFloat kCellRoundingRadius = 2.0;
 
 // Flips the given |rect| in context of the given |frame|.
@@ skipping 162 matching lines @@
     description_.reset([CreateClassifiedAttributedString(
         answerString, DimTextColor(), match_.description_class) retain]);
   } else if (match_.description.empty()) {
     description_.reset();
   } else {
     description_.reset([CreateClassifiedAttributedString(
         match_.description, DimTextColor(), match_.description_class) retain]);
   }
 }
 
+- (id)copyWithZone:(NSZone*)zone {
+  OmniboxPopupCell* copy = [super copyWithZone:zone];
+  copy->match_ = match_;
+  copy->separator_.reset([separator_ copy]);
+  copy->description_.reset([description_ copy]);
+  copy->prefix_.reset([prefix_ copy]);
+  copy->maxMatchContentsWidth_ = maxMatchContentsWidth_;
+  copy->contentsOffset_ = contentsOffset_;
+  return copy;
+}
+
+- (NSRect)drawingRectForBounds:(NSRect)theRect {
+  // Enlarge the cell size.

[shrike, 2015/04/27 18:30:10]

Do you mean decrease the cell size?

[dschuyler, 2015/05/01 21:50:53]

Done.

+  theRect.size.height -= kCellHeightAdjust;
+  return theRect;
+}
+
 - (void)setMaxMatchContentsWidth:(CGFloat)maxMatchContentsWidth {
   maxMatchContentsWidth_ = maxMatchContentsWidth;
 }
 
 - (void)setContentsOffset:(CGFloat)contentsOffset {
   contentsOffset_ = contentsOffset;
 }
 
 // The default NSButtonCell drawing leaves the image flush left and
 // the title next to the image.  This spaces things out to line up
@@ skipping 209 matching lines @@
   }
   glyphOffset -= minOffset;
   if (glyphWidth == 0)
     glyphWidth = inputWidth - glyphOffset;
   if (isContentsRTL)
     glyphOffset += glyphWidth;
   return isRTL ? (inputWidth - glyphOffset) : glyphOffset;
 }
 
 @end