[Web Intents] Refactor picker to use WebIntentPickerModel.

chrome/browser/ui/intents/web_intent_picker_delegate.h

Index: chrome/browser/ui/intents/web_intent_picker_delegate.h
diff --git a/chrome/browser/ui/intents/web_intent_picker_delegate.h b/chrome/browser/ui/intents/web_intent_picker_delegate.h
index 9f2c876db37bdfa4de18cb4d81a295cea2704e08..39c0da8841685c62a2cca89dbf8ceee3ed6a78f3 100644
--- a/chrome/browser/ui/intents/web_intent_picker_delegate.h
+++ b/chrome/browser/ui/intents/web_intent_picker_delegate.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.
 
@@ -6,15 +6,28 @@
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_DELEGATE_H_
 #pragma once
 
+#include "chrome/browser/ui/intents/web_intent_picker_model.h"
+
+namespace content {
+class WebContents;
+}
+
 // A class used to notify the delegate when the user has chosen a web intent
 // service.
 class WebIntentPickerDelegate {
  public:
+  typedef WebIntentPickerModel::Disposition Disposition;
+
   // Base destructor.
   virtual ~WebIntentPickerDelegate() {}
 
   // Callback called when the user has chosen a service.
-  virtual void OnServiceChosen(size_t index) = 0;
+  virtual void OnServiceChosen(size_t index, Disposition disposition) = 0;
+
+  // Callback called when the picker has created WebContents to use for inline

[groby-ooo-7-16, 2012/01/25 22:03:13]

nit: Callback called when -> Callback when

[binji, 2012/01/26 00:27:41]

Looks like "Called when" is most common.

+  // disposition.
+  virtual void OnInlineDispositionWebContentsCreated(
+      content::WebContents* web_contents) = 0;
 
   // Callback called when the user cancels out of the dialog, whether by closing
   // it manually or otherwise purposefully.