intents: Change default_service_url() to return a const-ref.

chrome/browser/ui/intents/web_intents_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_INTENTS_MODEL_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENTS_MODEL_H_
 
+#include "base/basictypes.h"
 #include "base/values.h"
-#include "chrome/browser/intents/web_intents_registry.h"
 #include "ui/base/models/tree_node_model.h"
 
 class WebIntentsRegistry;
-struct DefaultWebIntentService;
 
 // The tree structure is a TYPE_ROOT node with title="",
 // children are TYPE_ORIGIN nodes with title=origin, whose
 // children are TYPE_SERVICE nodes with title=origin, and
 // will be of type ServiceTreeNode with data on individual
 // services.
 class WebIntentsTreeNode : public ui::TreeNode<WebIntentsTreeNode> {
  public:
-  WebIntentsTreeNode();
-  explicit WebIntentsTreeNode(const string16& title);
-
-  virtual ~WebIntentsTreeNode();
-
   enum NodeType {
     TYPE_ROOT,
     TYPE_ORIGIN,
     TYPE_SERVICE,
   };
 
+  WebIntentsTreeNode();
+  explicit WebIntentsTreeNode(const string16& title);
+  virtual ~WebIntentsTreeNode();
+
   NodeType Type() const { return type_; }
 
  protected:
   WebIntentsTreeNode(const string16& title, NodeType type)
       : ui::TreeNode<WebIntentsTreeNode>(title),
         type_(type) {}
 
  private:
   NodeType type_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebIntentsTreeNode);
 };
 
 // Tree node representing particular services presented by an origin.
 class ServiceTreeNode : public WebIntentsTreeNode {
  public:
   explicit ServiceTreeNode(const string16& title);
   virtual ~ServiceTreeNode();
 
   const string16& ServiceName() const { return service_name_; }
   const string16& ServiceUrl() const { return service_url_; }
   const string16& IconUrl() const { return icon_url_; }
   const string16& Action() const { return action_; }
   const base::ListValue& Types() const { return types_; }
   bool IsBlocked() const { return blocked_; }
   bool IsDisabled() const { return disabled_; }
 
-  void SetServiceName(string16 name) { service_name_ = name; }
-  void SetServiceUrl(string16 url) { service_url_ = url; }
-  void SetIconUrl(string16 url) { icon_url_ = url; }
-  void SetAction(string16 action) { action_ = action; }
-  void AddType(string16 type) { types_.Append(Value::CreateStringValue(type)); }
+  void SetServiceName(const string16& name) { service_name_ = name; }
+  void SetServiceUrl(const string16& url) { service_url_ = url; }
+  void SetIconUrl(const string16& url) { icon_url_ = url; }
+  void SetAction(const string16& action) { action_ = action; }
+  void AddType(const string16& type) {
+    types_.Append(base::Value::CreateStringValue(type));
+  }
   void SetBlocked(bool blocked) { blocked_ = blocked; }
   void SetDisabled(bool disabled) { disabled_ = disabled; }
 
  private:
   string16 service_name_;
   string16 icon_url_;
   string16 service_url_;
   string16 action_;
   base::ListValue types_;
 
   // TODO(gbillock): these are kind of a placeholder for exceptions data.
   bool blocked_;
   bool disabled_;
+
+  DISALLOW_COPY_AND_ASSIGN(ServiceTreeNode);
 };
 
 // UI-backing tree model of the data in the WebIntentsRegistry.
 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
   // observers for every item added.
   class Observer : public ui::TreeModelObserver {
    public:
+    virtual ~Observer() {}

[groby-ooo-7-16, 2012/10/09 01:58:22]

nit: Technically not needed, since ui::TreeModelObserver implements a virtual
dtor. 

[tfarina, 2012/10/09 02:00:33]

Removed.

+
     virtual void TreeModelBeginBatch(WebIntentsModel* model) {}
     virtual void TreeModelEndBatch(WebIntentsModel* model) {}
   };
 
   explicit WebIntentsModel(WebIntentsRegistry* intents_registry);
   virtual ~WebIntentsModel();
 
   void AddWebIntentsTreeObserver(Observer* observer);
   void RemoveWebIntentsTreeObserver(Observer* observer);
 
   string16 GetTreeNodeId(WebIntentsTreeNode* node);
-  WebIntentsTreeNode* GetTreeNode(std::string path_id);
-  void GetChildNodeList(WebIntentsTreeNode* parent, int start, int count,
+  WebIntentsTreeNode* GetTreeNode(const std::string& path_id);
+  void GetChildNodeList(WebIntentsTreeNode* parent,
+                        int start,
+                        int count,
                         base::ListValue* nodes);
   void GetWebIntentsTreeNodeDictionary(const WebIntentsTreeNode& node,
                                        base::DictionaryValue* dict);
 
   void OnIntentsQueryDone(
       const std::vector<webkit_glue::WebIntentServiceData>& services);
 
  private:
   // Loads the data model from the WebIntentsRegistry.
   // TODO(gbillock): need an observer on that to absorb async updates?
   void LoadModel();
 
   // Get the model node for a particular host.
   WebIntentsTreeNode* GetNodeForHost(const std::string& host);
 
   // Do batch-specific notifies for updates coming from the LoadModel.
   void NotifyObserverBeginBatch();
   void NotifyObserverEndBatch();
 
   // The backing registry. Weak pointer.
   WebIntentsRegistry* intents_registry_;
 
   // Separate list of observers that'll get batch updates.
   ObserverList<Observer> intents_observer_list_;
 
   // Batch update nesting level. Incremented to indicate that we're in
   // the middle of a batch update.
   int batch_update_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebIntentsModel);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENTS_MODEL_H_