[OSX, WebIntents] Display suggestions label, unless there are no suggestions.

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"
@@ skipping 39 matching lines @@
 // 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 = kWindowWidth -
     (kFramePadding * 2 + kCloseButtonSize);
 
-}  // namespace
+// 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];
+}
 
-// Helper methods used for the creation of the picker sheet controls.
-@implementation WebIntentPickerSheetController (helpers)
-+ (NSButton*)createHyperlinkButton:(NSString*)title withFrame:(NSRect)frame {
+NSButton* CreateHyperlinkButton(NSString* title, const NSRect& frame) {
   NSButton* button = [[NSButton alloc] initWithFrame:frame];
   scoped_nsobject<HyperlinkButtonCell> cell(
       [[HyperlinkButtonCell alloc] initTextCell:title]);
   [cell setControlSize:NSSmallControlSize];
   [button setCell:cell.get()];
   [button setButtonType:NSMomentaryPushInButton];
   [button setBezelStyle:NSRegularSquareBezelStyle];
 
   return button;
 }
-@end
+
+}  // namespace
 
 // 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 113 matching lines @@
     imageFrame.size = [icon size];
     imageFrame.size.height = std::min(NSHeight(imageFrame), kMaxHeight);
     imageFrame.origin.y += (kMaxHeight - NSHeight(imageFrame)) / 2.0;
     [iconView_ setFrame:imageFrame];
     [subviews addObject:iconView_];
 
     // Add the extension title.
     NSRect frame = NSMakeRect(kTitleX, 0, 0, 0);
 
     NSString* string = base::SysUTF16ToNSString(extension->title);
-    cwsButton_.reset(
-      [WebIntentPickerSheetController createHyperlinkButton:string
-                                                  withFrame:frame]);
+    cwsButton_.reset(CreateHyperlinkButton(string, frame));
     [cwsButton_ setAlignment:NSLeftTextAlignment];
     [cwsButton_ setTarget:controller];
     [cwsButton_ setAction:@selector(openExtensionLink:)];
     [cwsButton_ setTag:index];
     [cwsButton_ sizeToFit];
 
     frame = [cwsButton_ frame];
     frame.size.height = std::min([[cwsButton_ cell] cellSize].height,
                                  kMaxHeight);
     frame.origin.y = (kMaxHeight - NSHeight(frame)) / 2.0;
@@ skipping 97 matching lines @@
   [throbber_ stopAnimation:self];
   [installButton_ setHidden:NO];
 }
 
 @end
 
 @interface SuggestionView : NSView {
  @private
   // Used to forward button clicks. Weak reference.
   WebIntentPickerSheetController* controller_;
+  scoped_nsobject<NSTextField> suggestionLabel_;
 }
 
 - (id)initWithModel:(WebIntentPickerModel*)model
       forController:(WebIntentPickerSheetController*)controller;
 - (void)startThrobberForRow:(NSInteger)index;
 - (void)stopThrobber;
 @end
 
 @implementation SuggestionView
 - (id)initWithModel:(WebIntentPickerModel*)model
       forController:(WebIntentPickerSheetController*)controller {
   const CGFloat kYMargin = 16.0;
   size_t count = model->GetSuggestedExtensionCount();
   if (count == 0)
     return nil;
 
   NSMutableArray* subviews = [NSMutableArray array];
 
+  NSRect textFrame = NSMakeRect(0, 0,
+                         kTextWidth, 1);
+  suggestionLabel_.reset([[NSTextField alloc] initWithFrame:textFrame]);
+  ConfigureTextFieldAsLabel(suggestionLabel_);
+
   CGFloat offset = kYMargin;
   for (size_t i = count; i > 0; --i) {
     const WebIntentPickerModel::SuggestedExtension& ext =
         model->GetSuggestedExtensionAt(i - 1);
     scoped_nsobject<NSView> suggestView(
         [[SingleSuggestionView alloc] initWithExtension:&ext
                                               withIndex:i-1
                                           forController:controller]);
     offset += [self addStackedView:suggestView.get()
                         toSubviews:subviews
                           atOffset:offset];
   }
+
+  [self updateSuggestionLabelForModel:model];
+  offset += [self addStackedView:suggestionLabel_
+                      toSubviews:subviews
+                      atOffset:offset];
+
   offset += kYMargin;
 
   NSRect contentFrame = NSMakeRect(kFramePadding, 0, kWindowWidth, offset);
   if(self =  [super initWithFrame:contentFrame])
     [self setSubviews: subviews];
 
   controller_ = controller;
   return self;
 }
 
+- (void)updateSuggestionLabelForModel:(WebIntentPickerModel*)model {
+  DCHECK(suggestionLabel_.get());
+  string16 labelText;
+
+  if (model->GetSuggestedExtensionCount() != 0) {

[Nico, 2012/05/16 23:55:25]

nit "> 0"

+    if (model->GetInstalledServiceCount() == 0)
+      labelText = l10n_util::GetStringUTF16(
+          IDS_INTENT_PICKER_GET_MORE_SERVICES_NONE_INSTALLED);
+    else
+      labelText = l10n_util::GetStringUTF16(
+          IDS_INTENT_PICKER_GET_MORE_SERVICES);
+  }
+
+  if (labelText.empty()) {
+    [suggestionLabel_ setHidden:TRUE];
+  } else {
+    NSRect textFrame = [suggestionLabel_ frame];
+
+    [suggestionLabel_ setHidden:FALSE];
+    [suggestionLabel_ setStringValue:base::SysUTF16ToNSString(labelText)];
+     textFrame.size.height +=
+         [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:
+               suggestionLabel_];
+     [suggestionLabel_ setFrame: textFrame];
+  }
+}
+
 - (void)startThrobberForRow:(NSInteger)index {
   for (SingleSuggestionView* row in [self subviews]) {
     [row setEnabled:NO];
     if ([row tag] == index)
       [row startThrobber];
   }
 }
 
 - (void)stopThrobber {
   for (SingleSuggestionView* row in [self subviews]) {
@@ skipping 105 matching lines @@
     picker_->OnExtensionInstallRequested(UTF16ToUTF8(extension.id));
   }
 }
 
 - (void)setIntentButtonsEnabled:(BOOL)enabled {
   for (NSButton* button in intentButtons_.get()) {
     [button setEnabled:enabled];
   }
 }
 
-// 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];
-}
-
 - (CGFloat)addStackedView:(NSView*)view
                toSubviews:(NSMutableArray*)subviews
                  atOffset:(CGFloat)offset {
   if (view == nil)
     return 0.0;
 
   NSPoint frameOrigin = [view frame].origin;
   frameOrigin.y = offset;
   [view setFrameOrigin:frameOrigin];
   [subviews addObject:view];
 
   return NSHeight([view frame]);
 }
 
 // Adds a link to the Chrome Web Store, to obtain further intent handlers.
 // Returns the y position delta for the next offset.
 - (CGFloat)addCwsButtonToSubviews:(NSMutableArray*)subviews
                          atOffset:(CGFloat)offset {
   NSRect frame = NSMakeRect(kFramePadding, offset, 100, 10);
   NSString* string =
       l10n_util::GetNSStringWithFixup(IDS_FIND_MORE_INTENT_HANDLER_MESSAGE);
-  scoped_nsobject<NSButton> button(
-    [WebIntentPickerSheetController createHyperlinkButton:string
-                                                withFrame:frame]);
+  scoped_nsobject<NSButton> button(CreateHyperlinkButton(string,frame));
   [button setTarget:self];
   [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]);
 }
 
@@ skipping 150 matching lines @@
       [NSArray arrayWithObject:contentView]];
 }
 
 - (void)setActionString:(NSString*)actionString {
   NSRect textFrame;
   if (!actionTextField_.get()) {
     textFrame = NSMakeRect(kFramePadding, 0,
                            kTextWidth, 1);
 
     actionTextField_.reset([[NSTextField alloc] initWithFrame:textFrame]);
-    [self configureTextFieldAsLabel:actionTextField_.get()];
+    ConfigureTextFieldAsLabel(actionTextField_);
     [actionTextField_ setFont:[NSFont systemFontOfSize:kHeaderFontSize]];
   } else {
     textFrame = [actionTextField_ frame];
   }
 
   [actionTextField_ setStringValue:actionString];
   textFrame.size.height +=
       [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:
             actionTextField_];
   [actionTextField_ setFrame: textFrame];
 }
 
 - (void)stopThrobber {
   [closeButton_ setEnabled:YES];
   [self setIntentButtonsEnabled:YES];
   [suggestionView_ stopThrobber];
 }
 
 - (void)closeSheet {
   [NSApp endSheet:[self window]];
 }
 @end  // WebIntentPickerSheetController