Made BookmarkService::GetBookmarks return both urls and title.

chrome/browser/bookmarks/bookmark_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_BOOKMARKS_BOOKMARK_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 274 matching lines @@
 
   // Returns true if there are bookmarks, otherwise returns false.
   // This method is thread safe.
   bool HasBookmarks();
 
   // Returns true if there is a bookmark with the |url|.
   // This method is thread safe.
   // See BookmarkService for more details on this.
   virtual bool IsBookmarked(const GURL& url) OVERRIDE;
 
-  // Returns all the bookmarked urls.
+  // Returns all the bookmarked urls and their title.

[sky, 2012/08/03 16:04:39]

title -> titles

[michaelbai, 2012/08/03 17:57:49]

Done.

   // This method is thread safe.
   // See BookmarkService for more details on this.
-  virtual void GetBookmarks(std::vector<GURL>* urls) OVERRIDE;
+  virtual void GetBookmarks(
+      std::vector<BookmarkService::Bookmark>* urls) OVERRIDE;
 
   // Blocks until loaded; this is NOT invoked on the main thread.
   // See BookmarkService for more details on this.
   virtual void BlockTillLoaded() OVERRIDE;
 
   // Returns the node with |id|, or NULL if there is no node with |id|.
   const BookmarkNode* GetNodeByID(int64 id) const;
 
   // Adds a new folder node at the specified position.
   const BookmarkNode* AddFolder(const BookmarkNode* parent,
@@ skipping 179 matching lines @@
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_