Remove unused code in ConfirmBubbleModel

chrome/browser/ui/cocoa/confirm_bubble_cocoa.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/confirm_bubble_cocoa.h"
 
 #include "base/strings/string16.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h"
 #include "chrome/browser/ui/confirm_bubble.h"
@@ skipping 10 matching lines @@
 const int kBubbleCornerRadius = 3;
 
 // The color for the border of this bubble view.
 const float kBubbleWindowEdge = 0.7f;
 
 // Constants used for layouting controls. These variables are copied from
 // "ui/views/layout/layout_constants.h".
 // Vertical spacing between a label and some control.
 const int kLabelToControlVerticalSpacing = 8;
 
-// Horizontal spacing between controls that are logically related.
-const int kRelatedControlHorizontalSpacing = 8;
-
 // Vertical spacing between controls that are logically related.
 const int kRelatedControlVerticalSpacing = 8;
 
 // Vertical spacing between the edge of the window and the
 // top or bottom of a button.
 const int kButtonVEdgeMargin = 6;
 
 // Horizontal spacing between the edge of the window and the
 // left or right of a button.
 const int kButtonHEdgeMargin = 7;
@@ skipping 187 matching lines @@
   [messageLabel_.get() setDrawsBackground:NO];
   [messageLabel_.get() setDelegate:self];
   [messageLabel_.get() sizeToFit];
   height = NSHeight([messageLabel_.get() frame]);
   [self addSubview:messageLabel_.get()];
 
   // Add the icon and the title label to the third row.
   left = kButtonHEdgeMargin;
   right = NSWidth(frameRect);
   bottom += height + kLabelToControlVerticalSpacing;
-  height = 0;
-  NSImage* iconImage = [controller_ icon];
-  if (iconImage) {
-    icon_.reset([[NSImageView alloc] initWithFrame:NSMakeRect(
-        left, bottom, [iconImage size].width, [iconImage size].height)]);
-    [icon_.get() setImage:iconImage];
-    [self addSubview:icon_.get()];
-    left += NSWidth([icon_.get() frame]) + kRelatedControlHorizontalSpacing;
-    height = std::max(height, NSHeight([icon_.get() frame]));
-  }
   titleLabel_.reset([[NSTextView alloc]
       initWithFrame:NSMakeRect(left, bottom, right - left, 0)]);
   [titleLabel_.get() setString:[controller_ title]];
   [titleLabel_.get() setHorizontallyResizable:NO];
   [titleLabel_.get() setVerticallyResizable:YES];
   [titleLabel_.get() setEditable:NO];
   [titleLabel_.get() setSelectable:NO];
   [titleLabel_.get() setDrawsBackground:NO];
   [titleLabel_.get() sizeToFit];
   [self addSubview:titleLabel_.get()];
-  height = std::max(height, NSHeight([titleLabel_.get() frame]));
+  height = NSHeight([titleLabel_.get() frame]);
 
   // Adjust the frame rectangle of this bubble so we can show all controls.
   NSRect parentRect = [parent_ frame];
   frameRect.size.height = bottom + height + kButtonVEdgeMargin;
   frameRect.origin.x = (NSWidth(parentRect) - NSWidth(frameRect)) / 2;
   frameRect.origin.y = NSHeight(parentRect) - NSHeight(frameRect);
   [self setFrame:frameRect];
 }
 
 // Closes this bubble and releases all resources. This function just puts the
@@ skipping 16 matching lines @@
 
 - (void)clickCancel {
   [self cancel:self];
 }
 
 - (void)clickLink {
   [self textView:messageLabel_.get() clickedOnLink:nil atIndex:0];
 }
 
 @end