Instant Extended: Reduce clipping in omnibox

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.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/location_bar/autocomplete_text_field_cell.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_logging.h"
+#include "chrome/browser/search/search.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/button_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/common/extensions/feature_switch.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "ui/base/cocoa/tracking_area.h"
 
 using extensions::FeatureSwitch;
 
 namespace {
 
-const CGFloat kBaselineAdjust = 3.0;
-
 // Matches the clipping radius of |GradientButtonCell|.
 const CGFloat kCornerRadius = 3.0;
 
 // How far to inset the left-hand decorations from the field's bounds.
 const CGFloat kLeftDecorationXOffset = 5.0;
 
 NSString* const kButtonDecorationKey = @"ButtonDecoration";
 
 // How far to inset the right-hand decorations from the field's bounds.
 // TODO(shess): Why is this different from |kLeftDecorationXOffset|?
@@ skipping 175 matching lines @@
 }
 
 }  // namespace
 
 @interface AutocompleteTextFieldCell ()
 - (CGFloat)textWidth;
 @end
 
 @implementation AutocompleteTextFieldCell
 
-- (CGFloat)baselineAdjust {
-  return kBaselineAdjust;
+- (CGFloat)topTextFrameOffset {
+  if (chrome::IsInstantExtendedAPIEnabled())
+    return 2.0;
+  return 3.0;
+}
+
+- (CGFloat)bottomTextFrameOffset {
+  return 3.0;
 }
 
 - (CGFloat)cornerRadius {
   return kCornerRadius;
 }
 
 - (CGFloat)edgeWidth {
   // The omnibox vertical edge width is 1 pixel both in low DPI and high DPI.
   return [[self controlView] cr_lineWidth];
 }
 
 - (BOOL)shouldDrawBezel {
   return YES;
 }
 
+- (CGFloat)lineHeight {
+  if (chrome::IsInstantExtendedAPIEnabled())
+    return 19;
+  return 16;

[Scott Hess - ex-Googler, 2013/05/23 20:08:02]

Per offline discussion, this is kinda fine, except I think it would work better
if it could somehow just fall out of the height-topborder-bottomborder
calculation.  If we're lucky, both values will be right rather than needing a
bunch of adjustment.

Too much more of this and I'll start suggesting someone should write a new file
to contain the random omnibox constants in one place.

[sail, 2013/05/23 20:45:44]

Unfortunately I couldn't find anyway to derive the line height from the frame
calculations. 

+}
+
 - (void)clearDecorations {
   leftDecorations_.clear();
   rightDecorations_.clear();
 }
 
 - (void)addLeftDecoration:(LocationBarDecoration*)decoration {
   leftDecorations_.push_back(decoration);
 }
 
 - (void)addRightDecoration:(LocationBarDecoration*)decoration {
@@ skipping 534 matching lines @@
 
 - (BOOL)showsFirstResponder {
   return [super showsFirstResponder] && !hideFocusState_;
 }
 
 - (CGFloat)textWidth {
   return [[self attributedStringValue] size].width;
 }
 
 @end