[Web Intents] Refactor picker to use WebIntentPickerModel.

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
new file mode 100644
index 0000000000000000000000000000000000000000..1d72597a02a984b14157afa21d499032225c48bc
--- /dev/null
+++ b/chrome/browser/ui/intents/web_intent_picker_model.h
@@ -0,0 +1,104 @@
+// 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_
+#pragma once
+
+#include <vector>
+
+#include "base/string16.h"
+#include "base/memory/scoped_ptr.h"
+#include "googleurl/src/gurl.h"
+
+class WebIntentPickerModelObserver;
+
+namespace gfx {
+class Image;
+}
+
+// Model for the WebIntentPicker.
+class WebIntentPickerModel {
+ public:
+  // The intent service 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 Item {
+    Item(const string16& title, const GURL& url, Disposition disposition);
+    ~Item();
+
+    // The title of this service.
+    string16 title;
+
+    // The URL of this service.
+    GURL url;
+
+    // A favicon of this service, or NULL if the default favicon should be
+    // used.
+    scoped_ptr<gfx::Image> favicon;
+
+    // The disposition to use when displaying this service.
+    Disposition disposition;
+
+    DISALLOW_COPY_AND_ASSIGN(Item);

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

This macro only works in private: section

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

Done.

+  };
+
+  WebIntentPickerModel();
+  ~WebIntentPickerModel();
+
+  void set_observer(WebIntentPickerModelObserver* observer) {
+    observer_ = observer;
+  }
+
+  // Add a new item with |title|, |url| and |disposition| to the picker.
+  void AddItem(const string16& title, const GURL& url, Disposition disposition);
+
+  // Remove an item from the picker at |index|.
+  void RemoveItemAt(size_t index);
+
+  // Remove all items from the picker, and resets to not displaying inline
+  // disposition.  Note that this does not clear the observer.
+  void Clear();
+
+  // Return the intent service item at |index|.
+  const Item& GetItemAt(size_t index) const;
+
+  // Return the number of intent services in the picker.
+  size_t GetItemCount() const;
+
+  // Update the favicon for the intent service at |index| to |image|.
+  void UpdateFaviconAt(size_t index, const gfx::Image& image);
+
+  // Set the picker to display the intent service at |index| inline.
+  void SetInlineDisposition(size_t index);
+
+  // Returns true if the picker is currently displaying an inline service.
+  bool IsInlineDisposition() const;
+
+  // Returns the index of the intent service that is being displayed inline, or
+  // std::string::npos if none.
+  size_t inline_disposition_index() const { return inline_disposition_index_; }

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

That is an odd thing to have on the model - shouldn't the picker provide that?

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

Maybe... I was thinking of the model as any necessary state to display the
picker. The currently displayed inline disposition service should be included in
that, right?

+
+ private:
+  // Delete all of |items_| and clear it.
+  void DestroyItems();
+
+  // A vector of all items in the picker. Each item is owned by this model.
+  std::vector<Item*> items_;
+
+  // The observer to send notifications to, or NULL if none.
+  WebIntentPickerModelObserver* observer_;

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

The observer should probably be a WeakPtr<> - that saves you from having to
remove it on destruction of observer. (To get weak ptrs of the PickerModel, have
it inherit from SupportsWeakPtr<>)

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

I don't see any examples of this.

+
+  // The index of the intent service that is being displayed inline, or
+  // std::string::npos if none.
+  size_t inline_disposition_index_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebIntentPickerModel);
+};
+
+#endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_MODEL_H_