[WebIntents, OSX] Clean up inline disposition to match mock.

chrome/browser/ui/cocoa/web_intent_sheet_controller.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/web_intent_sheet_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
+#include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 
+@interface HyperlinkButtonCell (Private)
+- (void)customizeButtonCell;
+@end
+
+@interface CustomLinkButtonCell : HyperlinkButtonCell
+@end
+
 namespace {
 
 // The width of a service button, in view coordinates.
 const CGFloat kServiceButtonWidth = 300;
 
 // Spacing in between sections.
 const CGFloat kVerticalSpacing = 18;
 
 // Square size of the close button.
 const CGFloat kCloseButtonSize = 16;
 
-// Font size for picker header.
-const CGFloat kHeaderFontSize = 14.5;
-
 // Width of the text fields.
 const CGFloat kTextWidth = WebIntentPicker::kWindowWidth -
     (WebIntentPicker::kContentAreaBorder * 2.0 + kCloseButtonSize);
 
 // Maximum number of intents (suggested and installed) displayed.
 const int kMaxIntentRows = 4;
 
 // Sets properties on the given |field| to act as title or description labels.
 void ConfigureTextFieldAsLabel(NSTextField* field) {
   [field setEditable:NO];
   [field setSelectable:YES];
   [field setDrawsBackground:NO];
   [field setBezeled:NO];
 }
 
 NSButton* CreateHyperlinkButton(NSString* title, const NSRect& frame) {
   NSButton* button = [[NSButton alloc] initWithFrame:frame];
-  scoped_nsobject<HyperlinkButtonCell> cell(
-      [[HyperlinkButtonCell alloc] initTextCell:title]);
+  scoped_nsobject<CustomLinkButtonCell> cell(
+      [[CustomLinkButtonCell alloc] initTextCell:title]);
   [cell setControlSize:NSSmallControlSize];
   [button setCell:cell.get()];
   [button setButtonType:NSMomentaryPushInButton];
   [button setBezelStyle:NSRegularSquareBezelStyle];
 
   return button;
 }
 
 }  // namespace
 
+
+// Provide custom link format for intent picker. Removes underline attribute,
+// since UX direction is "look like WebUI".
+@implementation CustomLinkButtonCell
+- (void)customizeButtonCell {
+  [super customizeButtonCell];
+  SkColor linkColor = SkColorSetARGB(0xff, 0x11, 0x55,0xcc);
+  [self setTextColor:gfx::SkColorToDeviceNSColor(linkColor)];

[Nico, 2012/09/07 16:50:21]

What's wrong with NSColor colorWithDeviceR:g:b:a? (If you keep this, add a space
in 0x55,0xcc

[groby-ooo-7-16, 2012/09/08 00:29:39]

Done.

+}
+
+- (NSDictionary*)linkAttributes {
+  scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
+    [[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
+  [paragraphStyle setAlignment:[self alignment]];
+
+  return @{NSForegroundColorAttributeName: [self textColor],

[Nico, 2012/09/07 16:50:21]

break after @{:

  return @{
    foo: ...,
    bar: ...,
  };

[groby-ooo-7-16, 2012/09/08 00:29:39]

Done.

+           NSFontAttributeName: [self font],
+           NSCursorAttributeName: [NSCursor pointingHandCursor],
+           NSParagraphStyleAttributeName: paragraphStyle.get()};
+}
+@end
+
 // This simple NSView subclass is used as the single subview of the page info
 // bubble's window's contentView. Drawing is flipped so that layout of the
 // sections is easier. Apple recommends flipping the coordinate origin when
 // doing a lot of text layout because it's more natural.
 @interface WebIntentsContentView : NSView
 @end
 @implementation WebIntentsContentView
 - (BOOL)isFlipped {
   return YES;
 }
@@ skipping 98 matching lines @@
                        kTextWidth, 1);
     subtitleField_.reset([[NSTextField alloc] initWithFrame:frame]);
     ConfigureTextFieldAsLabel(subtitleField_);
     gfx::Font textFont = rb.GetFont(ConstrainedWindow::kTextFontStyle);
     [subtitleField_ setFont:textFont.GetNativeFont()];
 
     frame = NSMakeRect(0, 0, WebIntentPicker::kWindowWidth, 1.0);
     spacer_.reset([[NSBox alloc] initWithFrame:frame]);
     [spacer_ setBoxType:NSBoxSeparator];
     [spacer_ setBorderColor:[NSColor blackColor]];
+    [spacer_ setAlphaValue:0.2];
 
     NSArray* subviews = @[titleField_, subtitleField_, spacer_];
     [self setSubviews:subviews];
   }
   return self;
 }
 
 - (void)setTitle:(NSString*)title {
   NSRect frame = [titleField_ frame];
   [titleField_ setStringValue:title];
@@ skipping 421 matching lines @@
                                   styleMask:NSTitledWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:YES]);
   if ((self = [super initWithWindow:window.get()])) {
     picker_ = picker;
     if (picker)
       model_ = picker->model();
 
     inlineDispositionTitleField_.reset([[NSTextField alloc] init]);
     ConfigureTextFieldAsLabel(inlineDispositionTitleField_);
-
+    [inlineDispositionTitleField_ setFont:[NSFont boldSystemFontOfSize:0]];
     flipView_.reset([[WebIntentsContentView alloc] init]);
     [flipView_ setAutoresizingMask:NSViewMinYMargin];
     [[[self window] contentView] setSubviews:
         [NSArray arrayWithObject:flipView_]];
 
     [self performLayoutWithModel:model_];
     [[self window] makeFirstResponder:self];
   }
   return self;
 }
@@ skipping 40 matching lines @@
   containerSize.height +=
       [webContentView frame].origin.y + WebIntentPicker::kContentAreaBorder;
   containerSize.width += 2 * WebIntentPicker::kContentAreaBorder;
 
   // Ensure minimum container width.
   containerSize.width =
       std::max(CGFloat(WebIntentPicker::kWindowWidth), containerSize.width);
 
   // Resize web contents.
   [webContentView setFrameSize:inlineContentSize];
-
-  // Position close button.
-  NSRect buttonFrame = [closeButton_ frame];
-  buttonFrame.origin.x = containerSize.width -
-      WebIntentPicker::kContentAreaBorder - kCloseButtonSize;
-  [closeButton_ setFrame:buttonFrame];
-
   [self setContainerSize:containerSize];
 }
 
 - (void)setContainerSize:(NSSize)containerSize {
   // Resize container views
   NSRect frame = NSMakeRect(0, 0, 0, 0);
   frame.size = containerSize;
   [[[self window] contentView] setFrame:frame];
   [flipView_ setFrame:frame];
 
@@ skipping 70 matching lines @@
   [button setAction:@selector(showChromeWebStore:)];
   [subviews addObject:button.get()];
 
   // Call size-to-fit to fixup for the localized string.
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:button.get()];
 
   return NSHeight([button frame]);
 }
 
 - (void)addCloseButtonToSubviews:(NSMutableArray*)subviews  {
+  const CGFloat kButtonFuzz = 4.0; // whitespace inside button frame.

[Nico, 2012/09/07 16:50:21]

in css speak this is called "padding", so call it padding

[groby-ooo-7-16, 2012/09/08 00:29:39]

Done.

   if (!closeButton_.get()) {
     NSRect buttonFrame = NSMakeRect(
-        WebIntentPicker::kContentAreaBorder + kTextWidth,
-        WebIntentPicker::kContentAreaBorder,
+        WebIntentPicker::kContentAreaBorder + kTextWidth + kButtonFuzz,
+        WebIntentPicker::kContentAreaBorder - kButtonFuzz,
         kCloseButtonSize, kCloseButtonSize);
     closeButton_.reset(
         [[HoverCloseButton alloc] initWithFrame:buttonFrame]);
+    // Anchor close button to upper right.
+    [closeButton_ setAutoresizingMask:NSViewMaxYMargin|NSViewMinXMargin];

[Nico, 2012/09/07 16:50:21]

y grows too the top, so this anchors to lower right. (…I guess this isn't
necessary then?)

[groby-ooo-7-16, 2012/09/08 00:29:39]

It's inside a flipped view. so it's actually anchored to top right :)

On 2012/09/07 16:50:21, Nico wrote:

[Nico, 2012/09/08 00:30:45]

Might be worth a comment then.

On 2012/09/08 00:29:39, groby wrote:

[groby-ooo-7-16, 2012/09/08 00:48:38]

Done.

     [closeButton_ setTarget:self];
     [closeButton_ setAction:@selector(cancelOperation:)];
   }
   [subviews addObject:closeButton_];
 }
 
 // Adds a header (icon and explanatory text) to picker bubble.
 // Returns the y position delta for the next offset.
 - (CGFloat)addHeaderToSubviews:(NSMutableArray*)subviews
                       atOffset:(CGFloat)offset {
@@ skipping 34 matching lines @@
       WebIntentPicker::kContentAreaBorder, offset, size.width(), size.height());
 
   [contents_->web_contents()->GetNativeView() setFrame:frame];
   [subviews addObject:contents_->web_contents()->GetNativeView()];
 
   return NSHeight(frame);
 }
 
 - (CGFloat)addAnotherServiceLinkToSubviews:(NSMutableArray*)subviews
                                   atOffset:(CGFloat)offset {
+  DCHECK(model_);
+  DCHECK(model_->IsInlineDisposition());
+  GURL url = model_->inline_disposition_url();
 
+  const WebIntentPickerModel::InstalledService* service =
+      model_->GetInstalledServiceWithURL(url);
+  DCHECK(service);
+
+  CGFloat originalOffset = offset;
+
+  // Icon for current service.
+  scoped_nsobject<NSImageView> icon;
+  NSRect imageFrame =  NSMakeRect(WebIntentPicker::kContentAreaBorder, offset,
+                                  0, 0);
+  icon.reset([[NSImageView alloc] initWithFrame:imageFrame]);
+  [icon setImage:service->favicon.ToNSImage()];
+  [icon setImageFrameStyle:NSImageFrameNone];
+  [icon setEnabled:YES];
+
+  imageFrame.size = [service->favicon.ToNSImage() size];
+  [icon setFrame:imageFrame];
+
+  [subviews addObject:icon];
+
+  // Resize control to fit text
   NSRect textFrame =
-      NSMakeRect(WebIntentPicker::kContentAreaBorder, offset, kTextWidth, 1);
+      NSMakeRect(NSMaxX(imageFrame) + 4,
+                 offset,
+                 WebIntentPicker::kTitleLinkMaxWidth, 1);
   [inlineDispositionTitleField_ setFrame:textFrame];
   [subviews addObject:inlineDispositionTitleField_];
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:inlineDispositionTitleField_];
   textFrame = [inlineDispositionTitleField_ frame];
 
   // Add link for "choose another service" if other suggestions are available
   // or if more than one (the current) service is installed.
   if (model_->GetInstalledServiceCount() > 1 ||
     model_->GetSuggestedExtensionCount()) {
     NSRect frame = NSMakeRect(
         NSMaxX(textFrame) + WebIntentPicker::kContentAreaBorder, offset,
-        WebIntentPicker::kTitleLinkMaxWidth, 1);
+        1, 1);
     NSString* string = l10n_util::GetNSStringWithFixup(
         IDS_INTENT_PICKER_USE_ALTERNATE_SERVICE);
     scoped_nsobject<NSButton> button(CreateHyperlinkButton(string, frame));
     [[button cell] setControlSize:NSRegularControlSize];
+    [[button cell] setFont:[NSFont controlContentFontOfSize:0]];
     [button setTarget:self];
     [button setAction:@selector(chooseAnotherService:)];
     [subviews addObject:button];
 
     // Call size-to-fit to fixup for the localized string.
     [GTMUILocalizerAndLayoutTweaker sizeToFitView:button];
 
+    // Right-align the "use another service" button.
+    frame = [button frame];
+    frame.origin.x = WebIntentPicker::kWindowWidth - NSWidth(frame) -
+        2 * WebIntentPicker::kContentAreaBorder - kCloseButtonSize;
+    [button setFrame:frame];
+    [button setAutoresizingMask:NSViewMinXMargin];
+
     // And finally, make sure the link and the title are horizontally centered.
     frame = [button frame];
     CGFloat height = std::max(NSHeight(textFrame), NSHeight(frame));
     frame.origin.y += (height - NSHeight(frame)) / 2.0;
     frame.size.height = height;
     textFrame.origin.y += (height - NSHeight(textFrame)) / 2.0;
     textFrame.size.height = height;
     [button setFrame:frame];
     [inlineDispositionTitleField_ setFrame:textFrame];
   }
 
-  return NSHeight(textFrame);
+  offset += NSHeight(textFrame) + kVerticalSpacing;
+
+  scoped_nsobject<NSBox> spacer;
+
+  NSRect frame = NSMakeRect(0, offset, WebIntentPicker::kWindowWidth, 1.0);
+  spacer.reset([[NSBox alloc] initWithFrame:frame]);
+  [spacer setBoxType:NSBoxSeparator];
+  [spacer setAlphaValue:0.2];
+  [spacer setAutoresizingMask:NSViewWidthSizable];
+  [subviews addObject: spacer];
+
+  return offset + kVerticalSpacing - originalOffset;
 }
 
 - (NSView*)createEmptyView {
   NSMutableArray* subviews = [NSMutableArray array];
 
   NSRect titleFrame = NSMakeRect(WebIntentPicker::kContentAreaBorder,
                                  WebIntentPicker::kContentAreaBorder,
                                  kTextWidth, 1);
   scoped_nsobject<NSTextField> title(
       [[NSTextField alloc] initWithFrame:titleFrame]);
@@ skipping 56 matching lines @@
       !model_->GetInstalledServiceCount() &&
       !model_->GetSuggestedExtensionCount();
 
   if (isEmpty) {
     scoped_nsobject<NSView> emptyView([self createEmptyView]);
     [subviews addObject:emptyView];
     offset += NSHeight([emptyView frame]);
   } else if (contents_) {
     offset += [self addAnotherServiceLinkToSubviews:subviews
                                            atOffset:offset];
-    offset += WebIntentPicker::kContentAreaBorder;
     offset += [self addInlineHtmlToSubviews:subviews atOffset:offset];
   } else {
     offset += [self addHeaderToSubviews:subviews atOffset:offset];
 
     if (model) {
       intentView_.reset(
           [[IntentView alloc] initWithModel:model forController:self]);
       offset += [self addStackedView:intentView_
                           toSubviews:subviews
                             atOffset:offset];
     }
     offset += [self addCwsButtonToSubviews:subviews atOffset:offset];
   }
-  [self addCloseButtonToSubviews:subviews];
 
   // Add the bottom padding.
   offset += WebIntentPicker::kContentAreaBorder;
 
+  // Resize to fit.
+  [self setContainerSize:NSMakeSize(WebIntentPicker::kWindowWidth, offset)];
+
+  [self addCloseButtonToSubviews:subviews];
+
   // Replace the window's content.
   [flipView_ setSubviews:subviews];
-
-  // And resize to fit.
-  [self setContainerSize:NSMakeSize(WebIntentPicker::kWindowWidth, offset)];
 }
 
 - (void)setActionString:(NSString*)actionString {
   NSRect textFrame;
   if (!actionTextField_.get()) {
     textFrame = NSMakeRect(WebIntentPicker::kContentAreaBorder, 0,
                            kTextWidth, 1);
 
     actionTextField_.reset([[NSTextField alloc] initWithFrame:textFrame]);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ skipping 25 matching lines @@
 - (void)stopThrobber {
   [closeButton_ setEnabled:YES];
   [intentView_ stopThrobber];
 }
 
 - (void)closeSheet {
   [NSApp endSheet:[self window]];
 }
 
 @end  // WebIntentPickerSheetController