diff options
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r-- | chrome/browser/bookmarks/bookmark_node_data.cc | 12 | ||||
-rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 3 | ||||
-rw-r--r-- | chrome/browser/bookmarks/bookmark_utils_unittest.cc | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc index c4c53d5..27e8683 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.cc +++ b/chrome/browser/bookmarks/bookmark_node_data.cc @@ -4,20 +4,24 @@ #include "chrome/browser/bookmarks/bookmark_node_data.h" +#include <string> + #include "app/clipboard/scoped_clipboard_writer.h" #include "base/basictypes.h" #include "base/pickle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#if defined(OS_MACOSX) -#include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" -#endif #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" -#include "chrome/browser/browser_process.h" #include "net/base/escape.h" +#if defined(OS_MACOSX) +#include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" +#else +#include "chrome/browser/browser_process.h" +#endif + const char* BookmarkNodeData::kClipboardFormatString = "chromium/x-bookmark-entries"; diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index d9cced5..55acbbe 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -4,6 +4,8 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" +#include <utility> + #include "app/drag_drop_types.h" #include "app/l10n_util.h" #include "app/tree_node_iterator.h" @@ -19,7 +21,6 @@ #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" #endif #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/history/query_parser.h" #include "chrome/browser/platform_util.h" diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc index f27ef8b..9de3b66 100644 --- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc @@ -8,10 +8,13 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" +#if !defined(OS_MACOSX) +#include "chrome/browser/browser_process.h" +#endif + typedef testing::Test BookmarkUtilsTest; TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) { @@ -127,4 +130,3 @@ TEST_F(BookmarkUtilsTest, CopyPaste) { bookmark_utils::CanPasteFromClipboard(model.GetBookmarkBarNode())); } #endif - |