Remove wstrings from bookmarks, part 7.

app/tree_node_model.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 APP_TREE_NODE_MODEL_H_
 #define APP_TREE_NODE_MODEL_H_
 #pragma once
 
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 138 matching lines @@
   int IndexOfChild(const NodeType* node) const {
     DCHECK(node);
     typename std::vector<NodeType*>::const_iterator i =
         std::find(children_->begin(), children_->end(), node);
     if (i != children_->end())
       return static_cast<int>(i - children_->begin());
     return -1;
   }
 
   // Sets the title of the node.
-  // TODO(munjal): Remove wstring overload once all code is moved to string16.
-#if !defined(WCHAR_T_IS_UTF16)
-  void SetTitle(const std::wstring& string) {
-    title_ = WideToUTF16(string);
-  }
-#endif
   void SetTitle(const string16& string) {
     title_ = string;
   }
 
   // TODO(munjal): Remove wstring version and rename GetTitleAsString16 to
   // GetTitle once all code is moved to string16.
   // Returns the title of the node.
   virtual std::wstring GetTitle() const {
     return UTF16ToWide(title_);
   }
@@ skipping 98 matching lines @@
   }
 
   NodeType* AsNode(TreeModelNode* model_node) {
     return static_cast<NodeType*>(model_node);
   }
 
   // Sets the title of the specified node.
   virtual void SetTitle(TreeModelNode* node,
                         const std::wstring& title) {
     DCHECK(node);
-    AsNode(node)->SetTitle(title);
+    AsNode(node)->SetTitle(WideToUTF16Hack(title));
     NotifyObserverTreeNodeChanged(node);
   }
 
   void Add(NodeType* parent, int index, NodeType* child) {
     DCHECK(parent && child);
     parent->Add(index, child);
     NotifyObserverTreeNodesAdded(parent, index, 1);
   }
 
   NodeType* Remove(NodeType* parent, int index) {
@@ skipping 27 matching lines @@
  private:
   // The observers.
   ObserverList<TreeModelObserver> observer_list_;
   // The root.
   scoped_ptr<NodeType> root_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeNodeModel);
 };
 
 #endif  // APP_TREE_NODE_MODEL_H_