intents: Remove the disposition enum in web intents model.

chrome/browser/ui/intents/web_intent_picker_model.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_INTENTS_WEB_INTENT_PICKER_MODEL_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_MODEL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #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.
     string16 title;
 
     // The URL of this service.
     GURL url;
 
     // A favicon of this service.
     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.
   struct SuggestedExtension {
     SuggestedExtension(const string16& title,
                        const string16& id,
                        double average_rating);
     ~SuggestedExtension();
 
     // The title of the intent service.
@@ skipping 22 matching lines @@
   const string16& type() const { return type_; }
   void set_type(const string16& type) { type_ = type; }
 
   const GURL& default_service_url() const { return default_service_url_; }
   void set_default_service_url(const GURL& default_url) {
     default_service_url_ = default_url;
   }
 
   // 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);
 
   // Remove all installed services from the picker, and resets to not
   // displaying inline disposition.  Note that this does not clear the
   // observer.
   void Clear();
 
   // Return the intent service installed at |index|.
@@ skipping 77 matching lines @@
   // finds a default service matching the intent being dispatched.
   GURL default_service_url_;
 
   // Indicates that there are still open requests to CWS.
   bool waiting_for_suggestions_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerModel);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_MODEL_H_