[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 54 matching lines @@
   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;
 }
+
+// Sets properties on the given |field| to act as title or description labels.
++ (void)configureTextFieldAsLabel:(NSTextField*)field {

[Nico, 2012/05/16 22:02:45]

nit: static methods can usually just be static toplevel functions

[groby-ooo-7-16, 2012/05/16 23:27:02]

Done.

+  [field setEditable:NO];
+  [field setSelectable:YES];
+  [field setDrawsBackground:NO];
+  [field setBezeled:NO];
+}
 @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 {
@@ skipping 234 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]);
+  [WebIntentPickerSheetController 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->GetInstalledServiceCount()!=0) {

[Nico, 2012/05/16 22:02:45]

spaces around !=

[groby-ooo-7-16, 2012/05/16 23:27:02]

Done.

+    if (model->GetInstalledServiceCount() == 0)

[Nico, 2012/05/16 22:02:45]

wait what? isn't that the negation of the previous condition? will this ever be
true?

[groby-ooo-7-16, 2012/05/16 23:27:02]

No, it won't. The first condition was wrong. Fixed.
On 2012/05/16 22:02:45, Nico wrote:

+      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];
@@ skipping 174 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()];
+    [WebIntentPickerSheetController 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