Chromium Code Reviews| 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 4c6504dc52cbb103097a4f20c577503563c9166f..eaea688b049220b54f5f9759149d826252b2c790 100644 |
| --- a/chrome/browser/ui/intents/web_intent_picker_model.h |
| +++ b/chrome/browser/ui/intents/web_intent_picker_model.h |
| @@ -7,16 +7,13 @@ |
| #include <vector> |
| +#include "base/basictypes.h" |
| #include "base/string16.h" |
| #include "googleurl/src/gurl.h" |
| #include "ui/gfx/image/image.h" |
| class WebIntentPickerModelObserver; |
| -namespace gfx { |
| -class Image; |
| -} |
| - |
| // Model for the WebIntentPicker. |
| class WebIntentPickerModel { |
| public: |
| @@ -74,20 +71,17 @@ class WebIntentPickerModel { |
| observer_ = observer; |
| } |
| + const string16& action() const { return action_; } |
| void set_action(const string16& action) { action_ = action; } |
| - const string16& action() { return action_; } |
| - |
| + const string16& mimetype() const { return mimetype_; } |
|
Greg Billock
2012/08/06 18:01:58
Can you change this name to just "type"? This isn'
tfarina
2012/08/07 01:08:56
Done.
|
| void set_mimetype(const string16& mimetype) { mimetype_ = mimetype; } |
| - const string16& mimetype() { return mimetype_; } |
| - |
| + const GURL& default_service_url() const { return default_service_url_; } |
| void set_default_service_url(const GURL& default_url) { |
| default_service_url_ = default_url; |
| } |
| - const GURL& default_service_url() { return default_service_url_; } |
| - |
| // Add a new installed service with |title|, |url| and |disposition| to the |
| // picker. |
| void AddInstalledService(const string16& title, |
| @@ -145,7 +139,7 @@ class WebIntentPickerModel { |
| // Returns the url of the intent service that is being displayed inline, or |
| // GURL::EmptyGURL() if none. |
| - GURL inline_disposition_url() const { return inline_disposition_url_; } |
| + const GURL& inline_disposition_url() const { return inline_disposition_url_; } |
| private: |
| // Delete all elements in |installed_services_| and |suggested_extensions_|. |
| @@ -160,7 +154,7 @@ class WebIntentPickerModel { |
| // by this model. |
| std::vector<SuggestedExtension*> suggested_extensions_; |
| - // The observer to send notifications to, or NULL if none. |
| + // The observer to send notifications to, or NULL if none. Not owned. |
| WebIntentPickerModelObserver* observer_; |
| // The url of the intent service that is being displayed inline, or |