Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: chrome/browser/bookmarks/bookmark_model.h

Issue 10825147: Made BookmarkService::GetBookmarks return both urls and title. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync again again Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ 5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ 6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 // Returns true if there are bookmarks, otherwise returns false. 286 // Returns true if there are bookmarks, otherwise returns false.
287 // This method is thread safe. 287 // This method is thread safe.
288 bool HasBookmarks(); 288 bool HasBookmarks();
289 289
290 // Returns true if there is a bookmark with the |url|. 290 // Returns true if there is a bookmark with the |url|.
291 // This method is thread safe. 291 // This method is thread safe.
292 // See BookmarkService for more details on this. 292 // See BookmarkService for more details on this.
293 virtual bool IsBookmarked(const GURL& url) OVERRIDE; 293 virtual bool IsBookmarked(const GURL& url) OVERRIDE;
294 294
295 // Returns all the bookmarked urls. 295 // Returns all the bookmarked urls and their titles.
296 // This method is thread safe. 296 // This method is thread safe.
297 // See BookmarkService for more details on this. 297 // See BookmarkService for more details on this.
298 virtual void GetBookmarks(std::vector<GURL>* urls) OVERRIDE; 298 virtual void GetBookmarks(
299 std::vector<BookmarkService::URLAndTitle>* urls) OVERRIDE;
299 300
300 // Blocks until loaded; this is NOT invoked on the main thread. 301 // Blocks until loaded; this is NOT invoked on the main thread.
301 // See BookmarkService for more details on this. 302 // See BookmarkService for more details on this.
302 virtual void BlockTillLoaded() OVERRIDE; 303 virtual void BlockTillLoaded() OVERRIDE;
303 304
304 // Returns the node with |id|, or NULL if there is no node with |id|. 305 // Returns the node with |id|, or NULL if there is no node with |id|.
305 const BookmarkNode* GetNodeByID(int64 id) const; 306 const BookmarkNode* GetNodeByID(int64 id) const;
306 307
307 // Adds a new folder node at the specified position. 308 // Adds a new folder node at the specified position.
308 const BookmarkNode* AddFolder(const BookmarkNode* parent, 309 const BookmarkNode* AddFolder(const BookmarkNode* parent,
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 489
489 // See description of IsDoingExtensiveChanges above. 490 // See description of IsDoingExtensiveChanges above.
490 int extensive_changes_; 491 int extensive_changes_;
491 492
492 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_; 493 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
493 494
494 DISALLOW_COPY_AND_ASSIGN(BookmarkModel); 495 DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
495 }; 496 };
496 497
497 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ 498 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698