[Material][Mac] Animation for Omnibox Verbose State Chips

chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm

 // Copyright (c) 2010 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 <cmath>
 
 #import "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
 // This is used to increase the right margin of this decoration.
 const CGFloat kRightSideMargin = 1.0;
 
 // Padding between the icon/label and bubble edges.
 CGFloat BubblePadding() {
   return ui::MaterialDesignController::IsModeMaterial() ? 8.0 : 3.0;
 }
 
-// Additional padding between the divider between the omnibox text and the
-// divider. The desired value is 8px. We get 3px by subtracting the existing
-// padding in location_bar_view from 8px.
-CGFloat DividerPadding() {
-  return ui::MaterialDesignController::IsModeMaterial() ? 2.0 : 0.0;
-}
+const CGFloat kDividerPadding = 2.0;
 
 // Padding between the icon and label.
 CGFloat kIconLabelPadding = 4.0;
 
 // Inset for the background.
 const CGFloat kBackgroundYInset = 4.0;
 
 }  // namespace
 
 BubbleDecoration::BubbleDecoration() : retina_baseline_offset_(0) {
   attributes_.reset([[NSMutableDictionary alloc] init]);
   [attributes_ setObject:LocationBarDecoration::GetFont()
                   forKey:NSFontAttributeName];
+
+  base::scoped_nsobject<NSMutableParagraphStyle> style(
+      [[NSMutableParagraphStyle alloc] init]);
+  [style setLineBreakMode:NSLineBreakByClipping];
+  [attributes_ setObject:style forKey:NSParagraphStyleAttributeName];
 }
 
 BubbleDecoration::~BubbleDecoration() {
 }
 
+// Additional padding between the divider between the omnibox text and the
+// divider. The desired value is 8px. We get 3px by subtracting the existing
+// padding in location_bar_view from 8px.
+CGFloat BubbleDecoration::DividerPadding() const {
+  return ui::MaterialDesignController::IsModeMaterial() ? kDividerPadding : 0.0;
+}
+
 CGFloat BubbleDecoration::GetWidthForImageAndLabel(NSImage* image,
                                                    NSString* label) {
   if (!image && !label)
     return kOmittedWidth;
 
   const CGFloat image_width = image ? [image size].width : 0.0;
   if (!label)
     return BubblePadding() + image_width;
 
   // The bubble needs to take up an integral number of pixels.
@@ skipping 75 matching lines @@
     textRect.size.width = NSMaxX(decoration_frame) - NSMinX(textRect);
     // Transform the coordinate system to adjust the baseline on Retina. This is
     // the only way to get fractional adjustments.
     gfx::ScopedNSGraphicsContextSaveGState saveGraphicsState;
     CGFloat lineWidth = [control_view cr_lineWidth];
     if (lineWidth < 1) {
       NSAffineTransform* transform = [NSAffineTransform transform];
       [transform translateXBy:0 yBy:retina_baseline_offset_];
       [transform concat];
     }
-    DrawLabel(label_, attributes_, textRect);
+
+    base::scoped_nsobject<NSAttributedString> str([[NSAttributedString alloc]
+        initWithString:label_
+            attributes:attributes_]);
+
+    DrawAttributedString(str, textRect);
   }
 }
 
 void BubbleDecoration::DrawWithBackgroundInFrame(NSRect background_frame,
                                                  NSRect frame,
                                                  NSView* control_view) {
   NSRect rect = NSInsetRect(background_frame, 0, 1);
   rect.size.width -= kRightSideMargin;
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     ui::DrawNinePartImage(
@@ skipping 27 matching lines @@
   [attributes_ setObject:text_color forKey:NSForegroundColorAttributeName];
 }
 
 void BubbleDecoration::SetFont(NSFont* font) {
   [attributes_ setObject:font forKey:NSFontAttributeName];
 }
 
 void BubbleDecoration::SetRetinaBaselineOffset(CGFloat offset) {
   retina_baseline_offset_ = offset;
 }