intents: Constantify some getter accessors.

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"
 
 class WebIntentPickerModelObserver;
 
-namespace gfx {
-class Image;
-}
-
 // 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.
   };
 
@@ skipping 37 matching lines @@
     gfx::Image icon;
   };
 
   WebIntentPickerModel();
   ~WebIntentPickerModel();
 
   void set_observer(WebIntentPickerModelObserver* observer) {
     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't limited to mime types.

[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,
                            const GURL& url,
                            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
@@ skipping 37 matching lines @@
                                        const gfx::Image& image);
 
   // Set the picker to display the intent service with |url| inline.
   void SetInlineDisposition(const GURL& url);
 
   // Returns true if the picker is currently displaying an inline service.
   bool IsInlineDisposition() const;
 
   // 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_|.
   // Note that this method does not reset the observer.
   void DestroyAll();
 
   // A vector of all installed services in the picker. Each installed service
   // is owned by this model.
   std::vector<InstalledService*> installed_services_;
 
   // A vector of all suggested extensions in the picker. Each element is owned
   // 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
   // GURL::EmptyGURL() if none.
   GURL inline_disposition_url_;
 
   // A cached copy of the action that instantiated the picker.
   string16 action_;
 
   // A cached copy of the mimetype that instantiated the picker.
   string16 mimetype_;
 
   // The non-empty url of the default service if the WebIntentsRegistry
   // finds a default service matching the intent being dispatched.
   GURL default_service_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerModel);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_MODEL_H_