diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 23:14:46 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 23:14:46 +0000 |
| commit | 42eb6b07c2791d8d13ec48ea3c92725eee4d94a2 (patch) | |
| tree | 9c72c5052409725827617584d7891f1fcd5b5c9e /chrome/browser/bookmarks/bookmark_model.h | |
| parent | 60aac62ddf3cc40741a824cae25ab190005513be (diff) | |
| download | chromium_src-42eb6b07c2791d8d13ec48ea3c92725eee4d94a2.zip chromium_src-42eb6b07c2791d8d13ec48ea3c92725eee4d94a2.tar.gz chromium_src-42eb6b07c2791d8d13ec48ea3c92725eee4d94a2.tar.bz2 | |
Port some files in chrome/browser/ - part 1.
Review URL: http://codereview.chromium.org/11402
Patch from Pawel Hajdan Jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_model.h')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 1262a9e..182d3cc 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -5,9 +5,13 @@ #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_ +#include "build/build_config.h" + #include "base/lock.h" #include "base/observer_list.h" +#if defined(OS_WIN) #include "base/scoped_handle.h" +#endif // defined(OS_WIN) #include "chrome/browser/bookmarks/bookmark_service.h" #include "chrome/browser/bookmarks/bookmark_storage.h" #include "chrome/browser/cancelable_request.h" @@ -436,7 +440,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { Lock url_lock_; // Used for loading favicons and the empty history request. - CancelableRequestConsumerT<BookmarkNode*, NULL> load_consumer_; + CancelableRequestConsumerTSimple<BookmarkNode*> load_consumer_; // Reads/writes bookmarks to disk. scoped_refptr<BookmarkStorage> store_; @@ -446,8 +450,12 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { // doesn't exist and the history service hasn't finished loading. bool waiting_for_history_load_; +#if defined(OS_WIN) + // TODO(port): Implement for other platforms. + // Handle to event signaled when loading is done. ScopedHandle loaded_signal_; +#endif DISALLOW_COPY_AND_ASSIGN(BookmarkModel); }; |