diff options
35 files changed, 88 insertions, 35 deletions
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 1028de9..f19a821 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -39,6 +39,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" +using bookmarks::BookmarkNodeData; + namespace extensions { namespace bookmark_keys = bookmark_api_constants; diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h index d84ad25..137589f 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h @@ -17,9 +17,12 @@ #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/event_router.h" -struct BookmarkNodeData; class Profile; +namespace bookmarks { +struct BookmarkNodeData; +} + namespace content { class BrowserContext; class WebContents; @@ -92,14 +95,14 @@ class BookmarkManagerPrivateDragEventRouter virtual ~BookmarkManagerPrivateDragEventRouter(); // BookmarkTabHelper::BookmarkDrag interface - virtual void OnDragEnter(const BookmarkNodeData& data) OVERRIDE; - virtual void OnDragOver(const BookmarkNodeData& data) OVERRIDE; - virtual void OnDragLeave(const BookmarkNodeData& data) OVERRIDE; - virtual void OnDrop(const BookmarkNodeData& data) OVERRIDE; + virtual void OnDragEnter(const bookmarks::BookmarkNodeData& data) OVERRIDE; + virtual void OnDragOver(const bookmarks::BookmarkNodeData& data) OVERRIDE; + virtual void OnDragLeave(const bookmarks::BookmarkNodeData& data) OVERRIDE; + virtual void OnDrop(const bookmarks::BookmarkNodeData& data) OVERRIDE; // The bookmark drag and drop data. This gets set after a drop was done on // the page. This returns NULL if no data is available. - const BookmarkNodeData* GetBookmarkNodeData(); + const bookmarks::BookmarkNodeData* GetBookmarkNodeData(); // Clears the drag and drop data. void ClearBookmarkNodeData(); @@ -111,7 +114,7 @@ class BookmarkManagerPrivateDragEventRouter Profile* profile_; content::WebContents* web_contents_; - BookmarkNodeData bookmark_drag_data_; + bookmarks::BookmarkNodeData bookmark_drag_data_; DISALLOW_COPY_AND_ASSIGN(BookmarkManagerPrivateDragEventRouter); }; diff --git a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h index 1d08174..e5f27b0 100644 --- a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h +++ b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h @@ -42,7 +42,7 @@ class WebDragBookmarkHandlerAura : public content::WebDragDestDelegate { content::WebContents* web_contents_; // The bookmark data for the active drag. Empty when there is no active drag. - BookmarkNodeData bookmark_drag_data_; + bookmarks::BookmarkNodeData bookmark_drag_data_; DISALLOW_COPY_AND_ASSIGN(WebDragBookmarkHandlerAura); }; diff --git a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc index 0c4f491..db782f8 100644 --- a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc +++ b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc @@ -15,6 +15,8 @@ #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "ui/base/dragdrop/drag_drop_types.h" +using bookmarks::BookmarkNodeData; + namespace chrome { int DropBookmarks(Profile* profile, diff --git a/chrome/browser/ui/bookmarks/bookmark_drag_drop.h b/chrome/browser/ui/bookmarks/bookmark_drag_drop.h index fbce748..8b7885c 100644 --- a/chrome/browser/ui/bookmarks/bookmark_drag_drop.h +++ b/chrome/browser/ui/bookmarks/bookmark_drag_drop.h @@ -11,9 +11,12 @@ #include "ui/gfx/native_widget_types.h" class BookmarkNode; -struct BookmarkNodeData; class Profile; +namespace bookmarks { +struct BookmarkNodeData; +} + namespace chrome { // Starts the process of dragging a folder of bookmarks. @@ -27,7 +30,7 @@ void DragBookmarks(Profile* profile, // are copied, otherwise they are moved if they belong to the same |profile|. // Returns the drop type used. int DropBookmarks(Profile* profile, - const BookmarkNodeData& data, + const bookmarks::BookmarkNodeData& data, const BookmarkNode* parent_node, int index, bool copy); diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h index c8bef04..fcb07db 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h @@ -9,9 +9,12 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -struct BookmarkNodeData; class BookmarkTabHelperDelegate; +namespace bookmarks { +struct BookmarkNodeData; +} + namespace content { class WebContents; } @@ -25,10 +28,10 @@ class BookmarkTabHelper // Interface for forwarding bookmark drag and drop to extenstions. class BookmarkDrag { public: - virtual void OnDragEnter(const BookmarkNodeData& data) = 0; - virtual void OnDragOver(const BookmarkNodeData& data) = 0; - virtual void OnDragLeave(const BookmarkNodeData& data) = 0; - virtual void OnDrop(const BookmarkNodeData& data) = 0; + virtual void OnDragEnter(const bookmarks::BookmarkNodeData& data) = 0; + virtual void OnDragOver(const bookmarks::BookmarkNodeData& data) = 0; + virtual void OnDragLeave(const bookmarks::BookmarkNodeData& data) = 0; + virtual void OnDrop(const bookmarks::BookmarkNodeData& data) = 0; protected: virtual ~BookmarkDrag() {} diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 15675eb..61a3b29 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -65,6 +65,7 @@ #include "ui/gfx/image/image.h" using base::UserMetricsAction; +using bookmarks::BookmarkNodeData; using content::OpenURLParams; using content::Referrer; using content::WebContents; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm index ac68345..5c8db4d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm @@ -24,6 +24,7 @@ #include "components/bookmarks/browser/bookmark_node_data.h" #include "ui/base/theme_provider.h" +using bookmarks::BookmarkNodeData; using bookmarks::kBookmarkBarMenuCornerRadius; namespace { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h index e8d88ca..02bf77a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h @@ -9,7 +9,6 @@ @class BookmarkBarFolderController; @class BookmarkButton; -struct BookmarkNodeData; class BookmarkModel; class BookmarkNode; @class BrowserWindowController; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm index 9b54cc0..1886cd2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm @@ -24,6 +24,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +using bookmarks::BookmarkNodeData; + namespace chrome { namespace { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm index a8a3377..c8e66ed 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm @@ -14,6 +14,8 @@ #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h" #import "ui/base/cocoa/cocoa_base_utils.h" +using bookmarks::BookmarkNodeData; + NSString* kBookmarkButtonDragType = @"ChromiumBookmarkButtonDragType"; @interface BookmarkFolderTarget() diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h index 559a55c..28a143d 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h +++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h @@ -39,7 +39,7 @@ class WebDragBookmarkHandlerMac : public content::WebDragDestDelegate { // The bookmark data for the current tab. This will be empty if there is not // a native bookmark drag. - BookmarkNodeData bookmark_drag_data_; + bookmarks::BookmarkNodeData bookmark_drag_data_; DISALLOW_COPY_AND_ASSIGN(WebDragBookmarkHandlerMac); }; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 18d2c82..9bf85a1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -89,6 +89,7 @@ #include "ui/views/window/non_client_view.h" using base::UserMetricsAction; +using bookmarks::BookmarkNodeData; using content::OpenURLParams; using content::PageNavigator; using content::Referrer; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 5383d8980..8c072bd 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -343,7 +343,7 @@ class BookmarkBarView : public DetachableToolbarView, // Calculates the location for the drop in |location|. void CalculateDropLocation(const ui::DropTargetEvent& event, - const BookmarkNodeData& data, + const bookmarks::BookmarkNodeData& data, DropLocation* location); // Writes a BookmarkNodeData for node to data. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc index 1145d2e..3b57e34 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc @@ -20,6 +20,8 @@ #include "ui/views/drag_utils.h" #include "ui/views/widget/widget.h" +using bookmarks::BookmarkNodeData; + namespace chrome { void DragBookmarks(Profile* profile, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h index 4377103..1dcf68f 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h @@ -6,9 +6,12 @@ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_DRAG_DROP_VIEWS_H_ class BookmarkNode; -struct BookmarkNodeData; class Profile; +namespace bookmarks { +struct BookmarkNodeData; +} + namespace content { class BrowserContext; } @@ -33,7 +36,7 @@ int GetPreferredBookmarkDropOperation(int source_operations, int operations); // drop is over. int GetBookmarkDropOperation(Profile* profile, const ui::DropTargetEvent& event, - const BookmarkNodeData& data, + const bookmarks::BookmarkNodeData& data, const BookmarkNode* parent, int index); @@ -43,7 +46,7 @@ int GetBookmarkDropOperation(Profile* profile, // |data| are an ancestor of |drop_parent| and one of the nodes isn't already // a child of |drop_parent| at |index|. bool IsValidBookmarkDropLocation(Profile* profile, - const BookmarkNodeData& data, + const bookmarks::BookmarkNodeData& data, const BookmarkNode* drop_parent, int index); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h index 86174c9..e863078 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h @@ -128,7 +128,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver, const BookmarkNode* node_; // Data for the drop. - BookmarkNodeData drop_data_; + bookmarks::BookmarkNodeData drop_data_; // The observer, may be null. BookmarkMenuControllerObserver* observer_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 139434f..c50d2f1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -33,6 +33,7 @@ #include "ui/views/widget/widget.h" using base::UserMetricsAction; +using bookmarks::BookmarkNodeData; using content::PageNavigator; using views::MenuItemView; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h index ddfd2ba..f470af1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h @@ -184,7 +184,7 @@ class BookmarkMenuDelegate : public BaseBookmarkModelObserver, views::MenuItemView* menu_; // Data for the drop. - BookmarkNodeData drop_data_; + bookmarks::BookmarkNodeData drop_data_; // Used when a context menu is shown. scoped_ptr<BookmarkContextMenu> context_menu_; diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 9f7109b..fc9b1f9 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -63,6 +63,7 @@ #include "chrome/browser/browser_process.h" #endif +using bookmarks::BookmarkNodeData; namespace { diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc index 4c52c20..b54eb02 100644 --- a/chrome/browser/undo/bookmark_undo_service.cc +++ b/chrome/browser/undo/bookmark_undo_service.cc @@ -16,6 +16,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +using bookmarks::BookmarkNodeData; + namespace { // BookmarkUndoOperation ------------------------------------------------------ diff --git a/components/bookmarks/browser/bookmark_client.h b/components/bookmarks/browser/bookmark_client.h index ea57ed7..d4142b1 100644 --- a/components/bookmarks/browser/bookmark_client.h +++ b/components/bookmarks/browser/bookmark_client.h @@ -73,7 +73,7 @@ class BookmarkClient : public KeyedService { // Returns a task that will be used to load any additional root nodes. This // task will be invoked in the Profile's IO task runner. - virtual bookmarks::LoadExtraCallback GetLoadExtraNodesCallback() = 0; + virtual LoadExtraCallback GetLoadExtraNodesCallback() = 0; // Returns true if the |permanent_node| can have its title updated. virtual bool CanSetPermanentNodeTitle(const BookmarkNode* permanent_node) = 0; diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc index c0a059f..5f26f67 100644 --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc @@ -31,6 +31,7 @@ using bookmarks::BookmarkExpandedStateTracker; using bookmarks::BookmarkIndex; using bookmarks::BookmarkLoadDetails; using bookmarks::BookmarkMatch; +using bookmarks::BookmarkNodeData; using bookmarks::BookmarkStorage; namespace { diff --git a/components/bookmarks/browser/bookmark_node_data.cc b/components/bookmarks/browser/bookmark_node_data.cc index 365c1ea..ad2ad42 100644 --- a/components/bookmarks/browser/bookmark_node_data.cc +++ b/components/bookmarks/browser/bookmark_node_data.cc @@ -13,6 +13,8 @@ #include "components/bookmarks/browser/bookmark_utils.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" +namespace bookmarks { + const char* BookmarkNodeData::kClipboardFormatString = "chromium/x-bookmark-entries"; @@ -251,8 +253,7 @@ std::vector<const BookmarkNode*> BookmarkNodeData::GetNodes( return nodes; for (size_t i = 0; i < elements.size(); ++i) { - const BookmarkNode* node = - bookmarks::GetBookmarkNodeByID(model, elements[i].id_); + const BookmarkNode* node = GetBookmarkNodeByID(model, elements[i].id_); if (!node) { nodes.clear(); return nodes; @@ -285,3 +286,5 @@ bool BookmarkNodeData::IsFromProfilePath( // An empty path means the data is not associated with any profile. return !profile_path_.empty() && profile_path_ == profile_path; } + +} // namespace bookmarks diff --git a/components/bookmarks/browser/bookmark_node_data.h b/components/bookmarks/browser/bookmark_node_data.h index 9fdf975..c44594e1 100644 --- a/components/bookmarks/browser/bookmark_node_data.h +++ b/components/bookmarks/browser/bookmark_node_data.h @@ -22,6 +22,8 @@ class BookmarkModel; class Pickle; class PickleIterator; +namespace bookmarks { + // BookmarkNodeData is used to represent the following: // // . A single URL. @@ -171,4 +173,6 @@ struct BookmarkNodeData { base::FilePath profile_path_; }; +} // namespace bookmarks + #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_ diff --git a/components/bookmarks/browser/bookmark_node_data_ios.cc b/components/bookmarks/browser/bookmark_node_data_ios.cc index cbf6e8d..44c45cb 100644 --- a/components/bookmarks/browser/bookmark_node_data_ios.cc +++ b/components/bookmarks/browser/bookmark_node_data_ios.cc @@ -6,6 +6,8 @@ #include "base/logging.h" +namespace bookmarks { + // static bool BookmarkNodeData::ClipboardContainsBookmarks() { NOTREACHED(); @@ -20,3 +22,5 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) { NOTREACHED(); return false; } + +} // namespace bookmarks diff --git a/components/bookmarks/browser/bookmark_node_data_mac.cc b/components/bookmarks/browser/bookmark_node_data_mac.cc index 1523885..2dde55e 100644 --- a/components/bookmarks/browser/bookmark_node_data_mac.cc +++ b/components/bookmarks/browser/bookmark_node_data_mac.cc @@ -6,6 +6,8 @@ #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h" +namespace bookmarks { + // static bool BookmarkNodeData::ClipboardContainsBookmarks() { return PasteboardContainsBookmarks(ui::CLIPBOARD_TYPE_COPY_PASTE); @@ -24,3 +26,5 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) { return false; } + +} // namespace bookmarks diff --git a/components/bookmarks/browser/bookmark_node_data_unittest.cc b/components/bookmarks/browser/bookmark_node_data_unittest.cc index bda1047..9a0ecd7 100644 --- a/components/bookmarks/browser/bookmark_node_data_unittest.cc +++ b/components/bookmarks/browser/bookmark_node_data_unittest.cc @@ -18,6 +18,8 @@ using base::ASCIIToUTF16; +namespace bookmarks { + class BookmarkNodeDataTest : public testing::Test { public: BookmarkNodeDataTest() {} @@ -294,3 +296,5 @@ TEST_F(BookmarkNodeDataTest, MetaInfo) { EXPECT_EQ("somevalue", meta_info_map["somekey"]); EXPECT_EQ("someothervalue", meta_info_map["someotherkey"]); } + +} // namespace bookmarks diff --git a/components/bookmarks/browser/bookmark_node_data_views.cc b/components/bookmarks/browser/bookmark_node_data_views.cc index b34116a..888ffcc 100644 --- a/components/bookmarks/browser/bookmark_node_data_views.cc +++ b/components/bookmarks/browser/bookmark_node_data_views.cc @@ -9,6 +9,8 @@ #include "base/strings/utf_string_conversions.h" #include "ui/base/clipboard/clipboard.h" +namespace bookmarks { + namespace { const char kJavaScriptScheme[] = "javascript"; @@ -69,3 +71,5 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) { return is_valid(); } + +} // namespace bookmarks diff --git a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h index aecb727..a382258 100644 --- a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h +++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h @@ -21,13 +21,13 @@ class FilePath; // Writes a set of bookmark elements from a profile to the specified pasteboard. void WriteBookmarksToPasteboard( ui::ClipboardType type, - const std::vector<BookmarkNodeData::Element>& elements, + const std::vector<bookmarks::BookmarkNodeData::Element>& elements, const base::FilePath& profile_path); // Reads a set of bookmark elements from the specified pasteboard. bool ReadBookmarksFromPasteboard( ui::ClipboardType type, - std::vector<BookmarkNodeData::Element>& elements, + std::vector<bookmarks::BookmarkNodeData::Element>& elements, base::FilePath* profile_path); // Returns true if the specified pasteboard contains any sort of bookmark diff --git a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm index 845929a..eec2540 100644 --- a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm +++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm @@ -11,6 +11,8 @@ #include "components/bookmarks/browser/bookmark_node.h" #include "ui/base/clipboard/clipboard.h" +using bookmarks::BookmarkNodeData; + NSString* const kBookmarkDictionaryListPboardType = @"BookmarkDictionaryListPboardType"; diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc index 50e0669..0ad059d 100644 --- a/components/bookmarks/browser/bookmark_storage.cc +++ b/components/bookmarks/browser/bookmark_storage.cc @@ -146,8 +146,7 @@ BookmarkStorage::BookmarkStorage( const base::FilePath& profile_path, base::SequencedTaskRunner* sequenced_task_runner) : model_(model), - writer_(profile_path.Append(bookmarks::kBookmarksFileName), - sequenced_task_runner), + writer_(profile_path.Append(kBookmarksFileName), sequenced_task_runner), weak_factory_(this) { sequenced_task_runner_ = sequenced_task_runner; writer_.set_commit_interval(base::TimeDelta::FromMilliseconds(kSaveDelayMS)); diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc index 03a56cc..304d2be 100644 --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc @@ -179,7 +179,7 @@ void CopyToClipboard(BookmarkModel* model, WriteToClipboard(ui::CLIPBOARD_TYPE_COPY_PASTE); if (remove_nodes) { - bookmarks::ScopedGroupBookmarkActions group_cut(model); + ScopedGroupBookmarkActions group_cut(model); for (size_t i = 0; i < filtered_nodes.size(); ++i) { int index = filtered_nodes[i]->parent()->GetIndexOf(filtered_nodes[i]); if (index > -1) @@ -200,7 +200,7 @@ void PasteFromClipboard(BookmarkModel* model, if (index == -1) index = parent->child_count(); - bookmarks::ScopedGroupBookmarkActions group_paste(model); + ScopedGroupBookmarkActions group_paste(model); CloneBookmarkNode(model, bookmark_data.elements, parent, index, true); } diff --git a/components/bookmarks/browser/bookmark_utils.h b/components/bookmarks/browser/bookmark_utils.h index 32dfbe8..9fcbfb5 100644 --- a/components/bookmarks/browser/bookmark_utils.h +++ b/components/bookmarks/browser/bookmark_utils.h @@ -140,7 +140,7 @@ base::string16 CleanUpTitleForMatching(const base::string16& title); // Returns true if all the |nodes| can be edited by the user, // as determined by BookmarkClient::CanBeEditedByUser(). -bool CanAllBeEditedByUser(bookmarks::BookmarkClient* client, +bool CanAllBeEditedByUser(BookmarkClient* client, const std::vector<const BookmarkNode*>& nodes); // Returns true if |url| has a bookmark in the |model| that can be edited diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc index fd3d472..6445373 100644 --- a/components/bookmarks/browser/bookmark_utils_unittest.cc +++ b/components/bookmarks/browser/bookmark_utils_unittest.cc @@ -315,7 +315,7 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) { test::TestBookmarkClient client; // Load a model with an extra node that is not editable. BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100); - bookmarks::BookmarkPermanentNodeList extra_nodes; + BookmarkPermanentNodeList extra_nodes; extra_nodes.push_back(extra_node); client.SetExtraNodesToLoad(extra_nodes.Pass()); @@ -418,7 +418,7 @@ TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) { test::TestBookmarkClient client; // Load a model with an extra node that is not editable. BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100); - bookmarks::BookmarkPermanentNodeList extra_nodes; + BookmarkPermanentNodeList extra_nodes; extra_nodes.push_back(extra_node); client.SetExtraNodesToLoad(extra_nodes.Pass()); |