[Web Intents] Refactor picker to use WebIntentPickerModel.

chrome/browser/ui/intents/web_intent_picker.h

Index: chrome/browser/ui/intents/web_intent_picker.h
diff --git a/chrome/browser/ui/intents/web_intent_picker.h b/chrome/browser/ui/intents/web_intent_picker.h
index 6dadb3e1b9b9cacecd97032bc71dfe91b44d0cbe..626becc64e0f4af66430f09739a06de2415288d3 100644
--- a/chrome/browser/ui/intents/web_intent_picker.h
+++ b/chrome/browser/ui/intents/web_intent_picker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,12 +8,12 @@
 
 #include <stddef.h>
 #include <vector>
+#include "base/string16.h"
 
 class Browser;
-class GURL;
-class SkBitmap;
 class TabContentsWrapper;
 class WebIntentPickerDelegate;
+class WebIntentPickerModel;
 
 namespace content {
 class WebContents;
@@ -22,28 +22,19 @@ class WebContents;
 // Base class for the web intent picker dialog.
 class WebIntentPicker {
  public:
-  class Delegate;
-
   // Platform specific factory function. This function will automatically show
   // the picker.
   static WebIntentPicker* Create(Browser* browser,
                                  TabContentsWrapper* wrapper,
-                                 WebIntentPickerDelegate* delegate);
-
-  // Initalizes this picker with the |urls|.
-  virtual void SetServiceURLs(const std::vector<GURL>& urls) = 0;
-
-  // Sets the icon for a service at |index|.
-  virtual void SetServiceIcon(size_t index, const SkBitmap& icon) = 0;
-
-  // Sets the icon for a service at |index| to be the default favicon.
-  virtual void SetDefaultServiceIcon(size_t index) = 0;
+                                 WebIntentPickerDelegate* delegate,
+                                 WebIntentPickerModel* model);
 
   // Hides the UI for this picker, and destroys its UI.
   virtual void Close() = 0;
 
-  // Show the inline disposition UI for the given URL.
-  virtual content::WebContents* SetInlineDisposition(const GURL& url) = 0;
+  // Called when the controller has finished all pending asynchronous
+  // activities.
+  virtual void OnPendingAsyncCompleted() {}
 
  protected:
   virtual ~WebIntentPicker() {}