intents: Remove the disposition enum in web intents model.

chrome/browser/ui/intents/web_intent_picker_model.h

Index: chrome/browser/ui/intents/web_intent_picker_model.h
diff --git a/chrome/browser/ui/intents/web_intent_picker_model.h b/chrome/browser/ui/intents/web_intent_picker_model.h
index 6ac103ccdff60a4475bfef6503ef62fd2c45ef05..71e1a9e815ff3b7bf035aeb5f66418bbbe79850f 100644
--- a/chrome/browser/ui/intents/web_intent_picker_model.h
+++ b/chrome/browser/ui/intents/web_intent_picker_model.h
@@ -11,24 +11,19 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/image/image.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 class WebIntentPickerModelObserver;
 
 // Model for the WebIntentPicker.
 class WebIntentPickerModel {
  public:
-  // The intent service disposition.
-  // TODO(gbillock): use the webkit_glue::WebIntentServiceData::Disposition
-  enum Disposition {
-    DISPOSITION_WINDOW,  // Display the intent service in a new window.
-    DISPOSITION_INLINE,  // Display the intent service in the picker.
-  };
-
   // An intent service to display in the picker.
   struct InstalledService {
-    InstalledService(const string16& title,
-                     const GURL& url,
-                     Disposition disposition);
+    InstalledService(
+        const string16& title,
+        const GURL& url,
+        webkit_glue::WebIntentServiceData::Disposition disposition);
     ~InstalledService();
 
     // The title of this service.
@@ -41,7 +36,7 @@ class WebIntentPickerModel {
     gfx::Image favicon;
 
     // The disposition to use when displaying this service.
-    Disposition disposition;
+    webkit_glue::WebIntentServiceData::Disposition disposition;
   };
 
   // A suggested extension to display in the picker.
@@ -84,9 +79,10 @@ class WebIntentPickerModel {
 
   // Add a new installed service with |title|, |url| and |disposition| to the
   // picker.
-  void AddInstalledService(const string16& title,
-                           const GURL& url,
-                           Disposition disposition);
+  void AddInstalledService(
+      const string16& title,
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition);
 
   // Remove an installed service from the picker at |index|.
   void RemoveInstalledServiceAt(size_t index);