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;
 
+const CGFloat kBaselineAdjustInstantExtended = 2.5;
+
 // 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 176 matching lines @@
 
 }  // namespace
 
 @interface AutocompleteTextFieldCell ()
 - (CGFloat)textWidth;
 @end
 
 @implementation AutocompleteTextFieldCell
 
 - (CGFloat)baselineAdjust {
+  if (chrome::IsInstantExtendedAPIEnabled())
+    return kBaselineAdjustInstantExtended;

[Scott Hess - ex-Googler, 2013/05/22 19:56:37]

No, this shouldn't be here.  Your example images clearly show that the effective
baseline didn't actually move.

[sail, 2013/05/22 20:23:55]

-baselineAdjust isn't used to adjust the baseline. It's used to control the size
of the drawing rect. I can rename it if you like.

[Scott Hess - ex-Googler, 2013/05/22 21:02:36]

That seems like a good idea, then.

   return kBaselineAdjust;
 }
 
 - (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];
@@ skipping 550 matching lines @@
 
 - (BOOL)showsFirstResponder {
   return [super showsFirstResponder] && !hideFocusState_;
 }
 
 - (CGFloat)textWidth {
   return [[self attributedStringValue] size].width;
 }
 
 @end