[Web Intents] Refactor picker to use WebIntentPickerModel.

chrome/browser/ui/cocoa/web_intent_bubble_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_bubble_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
@@ skipping 57 matching lines @@
                                             backing:NSBackingStoreBuffered
                                               defer:NO]);
   if ((self = [super initWithWindow:window.get()
                        parentWindow:parent
                          anchoredAt:point])) {
     picker_ = picker;
     iconImages_.reset([[NSPointerArray alloc] initWithOptions:
         NSPointerFunctionsStrongMemory |
         NSPointerFunctionsObjectPersonality]);
 
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    defaultIcon_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
-
     [[self bubble] setArrowLocation:info_bubble::kTopLeft];
     [self performLayout];
     [self showWindow:nil];
     picker_->set_controller(self);
   }
 
   return self;
 }
 
 - (void)setServiceURLs:(NSArray*)urls {
@@ skipping 143 matching lines @@
                          numberOfRows:numRows
                       numberOfColumns:iconsPerRow]);
 
   [matrix setCellSize:NSMakeSize(kImageSize,kImageSize)];
   [matrix setIntercellSpacing:NSMakeSize(kImagePadding,kImagePadding)];
 
   for (NSUInteger i = 0; i < [iconImages_ count]; ++i) {
     scoped_nsobject<NSButtonCell> cell([[NSButtonCell alloc] init]);
     NSImage* image = static_cast<NSImage*>([iconImages_ pointerAtIndex:i]);
     if (!image)
-      image = defaultIcon_;
+      continue;
 
     // Set cell styles so it acts as image button.
     [cell setBordered:NO];
     [cell setImage:image];
     [cell setImagePosition:NSImageOnly];
     [cell setButtonType:NSMomentaryChangeButton];
     [cell setTarget:self];
     [cell setAction:@selector(invokeService:)];
     [cell setTag:i];
     [cell setEnabled:YES];
 
     [matrix putCell:cell atRow:(i / iconsPerRow) column:(i % iconsPerRow)];
-    if (serviceURLs_ && [serviceURLs_ count] >= i)
+    if (serviceURLs_ && i < [serviceURLs_ count])
       [matrix setToolTip:[serviceURLs_ objectAtIndex:i] forCell:cell];
   }
 
   [subviews addObject:matrix];
   return NSHeight([matrix frame]);
 }
 
 - (CGFloat)addInlineHtmlToSubviews:(NSMutableArray*)subviews
                           atOffset:(CGFloat)offset {
   if (!contents_)
@@ skipping 39 matching lines @@
   windowFrame.origin.y -= NSHeight(windowFrame) -
       NSHeight([[self window] frame]);
 
   [[self window] setFrame:windowFrame display:YES animate:YES];
 
   // Replace the window's content.
   [[[self window] contentView] setSubviews:subviews];
 }
 
 @end  // WebIntentBubbleController