Switch to using WebIntentPickerModel, and bring picker closer to mocks.

chrome/browser/ui/cocoa/web_intent_picker_cocoa.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_WEB_INTENT_PICKER_COCOA_H_
 #define CHROME_BROWSER_UI_COCOA_WEB_INTENT_PICKER_COCOA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 
 class TabContentsWrapper;
 @class WebIntentBubbleController;
 class WebIntentInlineDispositionDelegate;
 
 // A bridge class that enables communication between ObjectiveC and C++.
 class WebIntentPickerCocoa : public WebIntentPicker,
@@ skipping 26 matching lines @@
   // Weak pointer to the |delegate_| to notify about user choice/cancellation.
   WebIntentPickerDelegate* delegate_;
 
   // The picker model. Weak reference.
   WebIntentPickerModel* model_;
 
   Browser* browser_;  // The browser we're in. Weak Reference.
 
   WebIntentBubbleController* controller_;  // Weak reference.
 
+  // Factory for weak ptrs, used for delayed callbacks.
+  base::WeakPtrFactory<WebIntentPickerCocoa> weak_ptr_factory_;
+
   // Tab contents wrapper to hold intent page if inline disposition is used.
   scoped_ptr<TabContentsWrapper> inline_disposition_tab_contents_;
 
   // Delegate for inline disposition tab contents.
   scoped_ptr<WebIntentInlineDispositionDelegate> inline_disposition_delegate_;
 
+  // Post a delayed task to do layout, if it isn't already pending.
+  void PerformDelayedLayout();
+
+  // Re-layout the intent picker.
+  void PerformLayout();
+
   // Default constructor, for testing only.
   WebIntentPickerCocoa();
 
   // For testing access.
   friend class WebIntentBubbleControllerTest;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerCocoa);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_WEB_INTENT_PICKER_COCOA_H_