Use existing model for initial layout, if we can.

BUG=128880
TEST=Try to repro the bug (with an empty profile), see it doesn't happen.

Review URL: https://chromiumcodereview.appspot.com/10413044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138283 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/web_intent_picker_cocoa.h

@@ -33,6 +33,8 @@ class WebIntentPickerCocoa : public WebIntentPicker,
 
   void OnSheetDidEnd(NSWindow* sheet);
 
+  WebIntentPickerModel* model() { return model_; }
+
   // WebIntentPickerDelegate forwarding API.
   void OnCancelled();
   void OnServiceChosen(size_t index);

chrome/browser/ui/cocoa/web_intent_sheet_controller.mm

@@ -459,8 +459,10 @@ NSButton* CreateHyperlinkButton(NSString* title, const NSRect& frame) {
 
   if ((self = [super initWithWindow:window.get()])) {
     picker_ = picker;
+    if (picker)
+      model_ = picker->model();
     intentButtons_.reset([[NSMutableArray alloc] init]);
-    [self performLayoutWithModel:NULL];
+    [self performLayoutWithModel:model_];
     [[self window] makeFirstResponder:self];
   }
   return self;