cocoa browser: remove non-MD location bar support

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

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
index 725668fdbedc0748628cfb67e1ebc6fd1b337794..d8b4a586bef8a4391b88fdb5af699df9700fb2a0 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
@@ -68,9 +68,7 @@
 const CGFloat kRightDividerPadding = 8.0;
 const CGFloat kLeftDividerPadding = 5.0;
 CGFloat DividerPadding() {
-  return ui::MaterialDesignController::IsModeMaterial()
-             ? kLeftDividerPadding + kRightDividerPadding
-             : 0.0;
+  return kLeftDividerPadding + kRightDividerPadding;

[Avi (use Gerrit), 2016/09/28 16:01:58]

can we make this

const CGFloat kDividerPadding = kLeftDividerPadding + kRightDividerPadding?

[Elly Fong-Jones, 2016/09/28 19:02:27]

Done.

 }
 
 // Color of the vector graphic icons. Used when the location is not dark.
@@ -375,13 +373,6 @@ - (void)timerFired:(NSTimer*)timer {
     // this ContentSettingDecoration's DrawInFrame() also draws the background.
     // In short, moving this code upstream to a common parent requires a non-
     // trivial bit of refactoring.
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      const ui::NinePartImageIds image_ids =
-          IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);
-      ui::DrawNinePartImage(
-          background_rect, image_ids, NSCompositeSourceOver, 1.0, true);
-    }
-
     // Draw the icon.
     NSImage* icon = GetImage();
     NSRect icon_rect = background_rect;
@@ -397,18 +388,16 @@ - (void)timerFired:(NSTimer*)timer {
         NSMaxX(background_rect) - NSMinX(remainder) - kLeftDividerPadding;
     DrawAttributedString(animated_text_, remainder);
 
-    if (ui::MaterialDesignController::IsModeMaterial()) {
-      NSBezierPath* line = [NSBezierPath bezierPath];
-      [line setLineWidth:1];
-      [line
-          moveToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
-                                  NSMinY(background_rect))];
-      [line
-          lineToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
-                                  NSMaxY(background_rect))];
-      [GetDividerColor(owner_->IsLocationBarDark()) set];
-      [line stroke];
-    }
+    NSBezierPath* line = [NSBezierPath bezierPath];
+    [line setLineWidth:1];
+    [line
+        moveToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
+                                NSMinY(background_rect))];
+    [line
+        lineToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
+                                NSMaxY(background_rect))];
+    [GetDividerColor(owner_->IsLocationBarDark()) set];
+    [line stroke];
   } else {
     // No animation, draw the image as normal.
     ImageDecoration::DrawInFrame(frame, control_view);