diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 18:18:55 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 18:18:55 +0000 |
| commit | 3f383853bdea91d3cf86d4214e4dfdee6a585805 (patch) | |
| tree | a3d0a6af5d86c3c35a02e81f7ef084a8e47a6c07 /chrome/browser/bookmarks | |
| parent | b38a4e5f1c482345cab0575fc89cc024d00b8817 (diff) | |
| download | chromium_src-3f383853bdea91d3cf86d4214e4dfdee6a585805.zip chromium_src-3f383853bdea91d3cf86d4214e4dfdee6a585805.tar.gz chromium_src-3f383853bdea91d3cf86d4214e4dfdee6a585805.tar.bz2 | |
Remove unneeded uses of base/pickle.h. Add some explicit #includes.
Review URL: http://codereview.chromium.org/60095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index f3b05a5..5f63b73 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -2,11 +2,14 @@ // 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_BAR_MODEL_H_ -#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_ +#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ +#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ #include "build/build_config.h" +#include <set> +#include <vector> + #include "base/lock.h" #include "base/observer_list.h" #include "base/waitable_event.h" @@ -19,6 +22,7 @@ #include "chrome/views/controls/tree/tree_node_model.h" #include "googleurl/src/gurl.h" #include "skia/include/SkBitmap.h" +#include "testing/gtest/include/gtest/gtest_prod.h" class BookmarkEditorView; class BookmarkModel; @@ -413,7 +417,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { // urls. // WARNING: nodes_ordered_by_url_set_ is accessed on multiple threads. As // such, be sure and wrap all usage of it around url_lock_. - typedef std::multiset<BookmarkNode*,NodeURLComparator> NodesOrderedByURLSet; + typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet; NodesOrderedByURLSet nodes_ordered_by_url_set_; Lock url_lock_; @@ -433,4 +437,4 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { DISALLOW_COPY_AND_ASSIGN(BookmarkModel); }; -#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_ +#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ |