Refactored WebIntentsRegistry to use callbacks instead of Consumer

BUG=
TEST=


Review URL: http://codereview.chromium.org/10033005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132734 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 9 deletions

diff --git a/chrome/browser/ui/intents/web_intents_model.h b/chrome/browser/ui/intents/web_intents_model.h
index e47878e..021b8cd 100644
--- a/chrome/browser/ui/intents/web_intents_model.h
+++ b/chrome/browser/ui/intents/web_intents_model.h
@@ -77,8 +77,7 @@ class ServiceTreeNode : public WebIntentsTreeNode {
 };
 
 // UI-backing tree model of the data in the WebIntentsRegistry.
-class WebIntentsModel : public ui::TreeNodeModel<WebIntentsTreeNode>,
-                        public WebIntentsRegistry::Consumer {
+class WebIntentsModel : public ui::TreeNodeModel<WebIntentsTreeNode> {
  public:
   // Because nodes are fetched in a background thread, they are not
   // present at the time the Model is created. The Model then notifies its
@@ -102,13 +101,8 @@ class WebIntentsModel : public ui::TreeNodeModel<WebIntentsTreeNode>,
   void GetWebIntentsTreeNodeDictionary(const WebIntentsTreeNode& node,
                                        base::DictionaryValue* dict);
 
-  virtual void OnIntentsQueryDone(
-      WebIntentsRegistry::QueryID query_id,
-      const std::vector<webkit_glue::WebIntentServiceData>& services) OVERRIDE;
-
-  virtual void OnIntentsDefaultsQueryDone(
-      WebIntentsRegistry::QueryID query_id,
-      const DefaultWebIntentService& default_service) OVERRIDE;
+  void OnIntentsQueryDone(
+      const std::vector<webkit_glue::WebIntentServiceData>& services);
 
  private:
   // Loads the data model from the WebIntentsRegistry.