diff options
Diffstat (limited to 'chrome/browser')
22 files changed, 124 insertions, 114 deletions
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc index 3048fb5..73c5066 100644 --- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc @@ -8,6 +8,7 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" @@ -233,20 +234,16 @@ ScopedJavaLocalRef<jobject> BookmarksBridge::CreateJavaBookmark( IsEditable(node)); } -void BookmarksBridge::ExtractBookmarkNodeInformation( - const BookmarkNode* node, - jobject j_result_obj) { +void BookmarksBridge::ExtractBookmarkNodeInformation(const BookmarkNode* node, + jobject j_result_obj) { JNIEnv* env = AttachCurrentThread(); if (!IsReachable(node)) return; Java_BookmarksBridge_addToList( - env, - j_result_obj, - CreateJavaBookmark(node).obj()); + env, j_result_obj, CreateJavaBookmark(node).obj()); } -const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id, - int type) { +const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id, int type) { const BookmarkNode* node; if (type == kBookmarkTypeManaged) { node = managed_bookmarks_shim_->GetNodeByID( @@ -255,13 +252,13 @@ const BookmarkNode* BookmarksBridge::GetNodeByID(long node_id, node = partner_bookmarks_shim_->GetNodeByID( static_cast<int64>(node_id)); } else { - node = bookmark_model_->GetNodeByID(static_cast<int64>(node_id)); + node = GetBookmarkNodeByID(bookmark_model_, static_cast<int64>(node_id)); } return node; } -const BookmarkNode* BookmarksBridge::GetFolderWithFallback( - long folder_id, int type) { +const BookmarkNode* BookmarksBridge::GetFolderWithFallback(long folder_id, + int type) { const BookmarkNode* folder = GetNodeByID(folder_id, type); if (!folder || folder->type() == BookmarkNode::URL || !IsFolderAvailable(folder)) { diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index dd8aecd..930f402 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -20,6 +20,7 @@ #include "chrome/browser/android/provider/run_on_ui_thread_blocking.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/favicon/favicon_service.h" @@ -220,7 +221,7 @@ class AddBookmarkTask : public BookmarkModelTask { if (!node) { const BookmarkNode* parent_node = NULL; if (parent_id >= 0) - parent_node = model->GetNodeByID(parent_id); + parent_node = GetBookmarkNodeByID(model, parent_id); if (!parent_node) parent_node = model->bookmark_bar_node(); @@ -255,7 +256,7 @@ class RemoveBookmarkTask : public BookmarkModelObserverTask { static void RunOnUIThread(BookmarkModel* model, const int64 id) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - const BookmarkNode* node = model->GetNodeByID(id); + const BookmarkNode* node = GetBookmarkNodeByID(model, id); if (node && node->parent()) { const BookmarkNode* parent_node = node->parent(); model->Remove(parent_node, parent_node->GetIndexOf(node)); @@ -326,7 +327,7 @@ class UpdateBookmarkTask : public BookmarkModelObserverTask { const base::string16& url, const int64 parent_id) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - const BookmarkNode* node = model->GetNodeByID(id); + const BookmarkNode* node = GetBookmarkNodeByID(model, id); if (node) { if (node->GetTitle() != title) model->SetTitle(node, title); @@ -339,7 +340,7 @@ class UpdateBookmarkTask : public BookmarkModelObserverTask { if (parent_id >= 0 && (!node->parent() || parent_id != node->parent()->id())) { - const BookmarkNode* new_parent = model->GetNodeByID(parent_id); + const BookmarkNode* new_parent = GetBookmarkNodeByID(model, parent_id); if (new_parent) model->Move(node, new_parent, 0); @@ -381,7 +382,7 @@ class BookmarkNodeExistsTask : public BookmarkModelTask { bool* result) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(result); - *result = model->GetNodeByID(id) != NULL; + *result = GetBookmarkNodeByID(model, id) != NULL; } private: @@ -407,7 +408,7 @@ class IsInMobileBookmarksBranchTask : public BookmarkModelTask { bool *result) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(result); - const BookmarkNode* node = model->GetNodeByID(id); + const BookmarkNode* node = GetBookmarkNodeByID(model, id); const BookmarkNode* mobile_node = model->mobile_node(); while (node && node != mobile_node) node = node->parent(); @@ -444,7 +445,7 @@ class CreateBookmarksFolderOnceTask : public BookmarkModelTask { // Invalid ids are assumed to refer to the Mobile Bookmarks folder. const BookmarkNode* parent = parent_id >= 0 ? - model->GetNodeByID(parent_id) : model->mobile_node(); + GetBookmarkNodeByID(model, parent_id) : model->mobile_node(); DCHECK(parent); bool in_mobile_bookmarks; @@ -548,7 +549,7 @@ class GetBookmarkNodeTask : public BookmarkModelTask { bool get_children, ScopedJavaGlobalRef<jobject>* jnode) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - const BookmarkNode* node = model->GetNodeByID(id); + const BookmarkNode* node = GetBookmarkNodeByID(model, id); if (!node || !jnode) return; diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc index 95f4940..c8c26e0 100644 --- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc +++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc @@ -8,7 +8,7 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "components/bookmarks/core/common/bookmark_pref_names.h" BookmarkExpandedStateTracker::BookmarkExpandedStateTracker( @@ -47,7 +47,7 @@ BookmarkExpandedStateTracker::GetExpandedNodes() { int64 node_id; const BookmarkNode* node; if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) && - (node = bookmark_model_->GetNodeByID(node_id)) != NULL && + (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL && node->is_folder()) { nodes.insert(node); } else { diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index cdd91f5..ec89a17 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -493,11 +493,6 @@ void BookmarkModel::BlockTillLoaded() { loaded_signal_.Wait(); } -const BookmarkNode* BookmarkModel::GetNodeByID(int64 id) const { - // TODO(sky): TreeNode needs a method that visits all nodes using a predicate. - return GetNodeByID(&root_, id); -} - const BookmarkNode* BookmarkModel::AddFolder(const BookmarkNode* parent, int index, const base::string16& title) { @@ -817,19 +812,6 @@ BookmarkNode* BookmarkModel::AddNode(BookmarkNode* parent, return node; } -const BookmarkNode* BookmarkModel::GetNodeByID(const BookmarkNode* node, - int64 id) const { - if (node->id() == id) - return node; - - for (int i = 0, child_count = node->child_count(); i < child_count; ++i) { - const BookmarkNode* result = GetNodeByID(node->GetChild(i), id); - if (result) - return result; - } - return NULL; -} - bool BookmarkModel::IsValidIndex(const BookmarkNode* parent, int index, bool allow_end) { diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 70ca10a..bccad41 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -74,16 +74,16 @@ class BookmarkModel : public content::NotificationObserver, // Returns the root node. The 'bookmark bar' node and 'other' node are // children of the root node. - const BookmarkNode* root_node() { return &root_; } + const BookmarkNode* root_node() const { return &root_; } // Returns the 'bookmark bar' node. This is NULL until loaded. - const BookmarkNode* bookmark_bar_node() { return bookmark_bar_node_; } + const BookmarkNode* bookmark_bar_node() const { return bookmark_bar_node_; } // Returns the 'other' node. This is NULL until loaded. - const BookmarkNode* other_node() { return other_node_; } + const BookmarkNode* other_node() const { return other_node_; } // Returns the 'mobile' node. This is NULL until loaded. - const BookmarkNode* mobile_node() { return mobile_node_; } + const BookmarkNode* mobile_node() const { return mobile_node_; } bool is_root_node(const BookmarkNode* node) const { return node == &root_; } @@ -173,9 +173,6 @@ class BookmarkModel : public content::NotificationObserver, // See BookmarkService for more details on this. virtual void BlockTillLoaded() OVERRIDE; - // Returns the node with |id|, or NULL if there is no node with |id|. - const BookmarkNode* GetNodeByID(int64 id) const; - // Adds a new folder node at the specified position. const BookmarkNode* AddFolder(const BookmarkNode* parent, int index, @@ -306,9 +303,6 @@ class BookmarkModel : public content::NotificationObserver, int index, BookmarkNode* node); - // Implementation of GetNodeByID. - const BookmarkNode* GetNodeByID(const BookmarkNode* node, int64 id) const; - // Returns true if the parent and index are valid. bool IsValidIndex(const BookmarkNode* parent, int index, bool allow_end); diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc index dda7111..8da095e 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.cc +++ b/chrome/browser/bookmarks/bookmark_node_data.cc @@ -10,7 +10,7 @@ #include "base/pickle.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" const char* BookmarkNodeData::kClipboardFormatString = @@ -250,7 +250,7 @@ std::vector<const BookmarkNode*> BookmarkNodeData::GetNodes( return nodes; for (size_t i = 0; i < elements.size(); ++i) { - const BookmarkNode* node = model->GetNodeByID(elements[i].id_); + const BookmarkNode* node = GetBookmarkNodeByID(model, elements[i].id_); if (!node) { nodes.clear(); return nodes; diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 01c0047..c41a933 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -111,6 +111,18 @@ bool HasSelectedAncestor(BookmarkModel* model, return HasSelectedAncestor(model, selected_nodes, node->parent()); } +const BookmarkNode* GetNodeByID(const BookmarkNode* node, int64 id) { + if (node->id() == id) + return node; + + for (int i = 0, child_count = node->child_count(); i < child_count; ++i) { + const BookmarkNode* result = GetNodeByID(node->GetChild(i), id); + if (result) + return result; + } + return NULL; +} + } // namespace namespace bookmark_utils { @@ -340,7 +352,7 @@ void DeleteBookmarkFolders(BookmarkModel* model, for (std::vector<int64>::const_iterator iter = ids.begin(); iter != ids.end(); ++iter) { - const BookmarkNode* node = model->GetNodeByID(*iter); + const BookmarkNode* node = GetBookmarkNodeByID(model, *iter); if (!node) continue; const BookmarkNode* parent = node->parent(); @@ -375,3 +387,8 @@ void RemoveAllBookmarks(BookmarkModel* model, const GURL& url) { } } // namespace bookmark_utils + +const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id) { + // TODO(sky): TreeNode needs a method that visits all nodes using a predicate. + return GetNodeByID(model->root_node(), id); +} diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h index c8566e7..a96be4e 100644 --- a/chrome/browser/bookmarks/bookmark_utils.h +++ b/chrome/browser/bookmarks/bookmark_utils.h @@ -109,4 +109,7 @@ void RemoveAllBookmarks(BookmarkModel* model, const GURL& url); } // namespace bookmark_utils +// Returns the node with |id|, or NULL if there is no node with |id|. +const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id); + #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_UTILS_H_ 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 8b3579e..f668ac0 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 @@ -63,12 +63,12 @@ namespace { // Returns a single bookmark node from the argument ID. // This returns NULL in case of failure. -const BookmarkNode* GetNodeFromString( - BookmarkModel* model, const std::string& id_string) { +const BookmarkNode* GetNodeFromString(BookmarkModel* model, + const std::string& id_string) { int64 id; if (!base::StringToInt64(id_string, &id)) return NULL; - return model->GetNodeByID(id); + return GetBookmarkNodeByID(model, id); } // Gets a vector of bookmark nodes from the argument list of IDs. diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc index 47920e5..58ff587 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc @@ -10,6 +10,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" #include "chrome/common/extensions/api/bookmarks.h" @@ -100,7 +101,7 @@ bool RemoveNode(BookmarkModel* model, int64 id, bool recursive, std::string* error) { - const BookmarkNode* node = model->GetNodeByID(id); + const BookmarkNode* node = GetBookmarkNodeByID(model, id); if (!node) { *error = keys::kNoNodeError; return false; diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index a49ca16..ba409d8 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -131,8 +131,8 @@ const BookmarkNode* BookmarksFunction::GetBookmarkNodeFromId( if (!GetBookmarkIdAsInt64(id_string, &id)) return NULL; - BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile()); - const BookmarkNode* node = model->GetNodeByID(id); + const BookmarkNode* node = GetBookmarkNodeByID( + BookmarkModelFactory::GetForProfile(GetProfile()), id); if (!node) error_ = keys::kNoNodeError; @@ -523,7 +523,7 @@ bool BookmarksCreateFunction::RunImpl() { if (!GetBookmarkIdAsInt64(*params->bookmark.parent_id, &parentId)) return false; } - const BookmarkNode* parent = model->GetNodeByID(parentId); + const BookmarkNode* parent = GetBookmarkNodeByID(model, parentId); if (!parent) { error_ = keys::kNoParentError; return false; @@ -611,7 +611,7 @@ bool BookmarksMoveFunction::RunImpl() { if (!GetBookmarkIdAsInt64(*params->destination.parent_id, &parentId)) return false; - parent = model->GetNodeByID(parentId); + parent = GetBookmarkNodeByID(model, parentId); } if (!parent) { error_ = keys::kNoParentError; @@ -739,7 +739,7 @@ class CreateBookmarkBucketMapper : public BookmarkBucketMapper<std::string> { int64 parent_id_int64; base::StringToInt64(parent_id, &parent_id_int64); - const BookmarkNode* parent = model->GetNodeByID(parent_id_int64); + const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_int64); if (!parent) return; @@ -777,7 +777,7 @@ class RemoveBookmarksBucketMapper : public BookmarkBucketMapper<std::string> { for (IdList::iterator it = ids.begin(); it != ids.end(); ++it) { BookmarkModel* model = BookmarkModelFactory::GetForProfile( Profile::FromBrowserContext(browser_context_)); - const BookmarkNode* node = model->GetNodeByID(*it); + const BookmarkNode* node = GetBookmarkNodeByID(model, *it); if (!node || node->is_root()) return; diff --git a/chrome/browser/history/DEPS b/chrome/browser/history/DEPS index 6585583..8e95bb0 100644 --- a/chrome/browser/history/DEPS +++ b/chrome/browser/history/DEPS @@ -24,6 +24,7 @@ include_rules = [ "!chrome/browser/bookmarks/bookmark_model.h", "!chrome/browser/bookmarks/bookmark_model_factory.h", "!chrome/browser/bookmarks/bookmark_service.h", + "!chrome/browser/bookmarks/bookmark_utils.h", "!chrome/browser/browser_process.h", "!chrome/browser/chromeos/login/existing_user_controller.h", "!chrome/browser/content_settings/cookie_settings.h", diff --git a/chrome/browser/history/android/bookmark_model_sql_handler.cc b/chrome/browser/history/android/bookmark_model_sql_handler.cc index 446d2af..392087c 100644 --- a/chrome/browser/history/android/bookmark_model_sql_handler.cc +++ b/chrome/browser/history/android/bookmark_model_sql_handler.cc @@ -8,6 +8,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_service.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/history/url_database.h" #include "chrome/browser/profiles/profile_manager.h" @@ -46,7 +47,7 @@ void BookmarkModelSQLHandler::Task::AddBookmark(const GURL& url, BookmarkModel* bookmark_model = GetBookmarkModel(); if (!bookmark_model) return; - const BookmarkNode* parent = bookmark_model->GetNodeByID(parent_id); + const BookmarkNode* parent = GetBookmarkNodeByID(bookmark_model, parent_id); if (parent) bookmark_model->AddURL(parent, 0, title, url); } diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index 58ae260..d83d6e8 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -16,6 +16,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/history/history_db_task.h" @@ -421,13 +422,14 @@ const BookmarkNode* AddURL(int profile, int index, const std::wstring& title, const GURL& url) { - if (GetBookmarkModel(profile)->GetNodeByID(parent->id()) != parent) { + BookmarkModel* model = GetBookmarkModel(profile); + if (GetBookmarkNodeByID(model, parent->id()) != parent) { LOG(ERROR) << "Node " << parent->GetTitle() << " does not belong to " << "Profile " << profile; return NULL; } - const BookmarkNode* result = GetBookmarkModel(profile)-> - AddURL(parent, index, base::WideToUTF16(title), url); + const BookmarkNode* result = + model->AddURL(parent, index, base::WideToUTF16(title), url); if (!result) { LOG(ERROR) << "Could not add bookmark " << title << " to Profile " << profile; @@ -435,9 +437,9 @@ const BookmarkNode* AddURL(int profile, } if (test()->use_verifier()) { const BookmarkNode* v_parent = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent); - const BookmarkNode* v_node = GetVerifierBookmarkModel()-> - AddURL(v_parent, index, base::WideToUTF16(title), url); + FindNodeInVerifier(model, parent, &v_parent); + const BookmarkNode* v_node = GetVerifierBookmarkModel()->AddURL( + v_parent, index, base::WideToUTF16(title), url); if (!v_node) { LOG(ERROR) << "Could not add bookmark " << title << " to the verifier"; return NULL; @@ -462,13 +464,14 @@ const BookmarkNode* AddFolder(int profile, const BookmarkNode* parent, int index, const std::wstring& title) { - if (GetBookmarkModel(profile)->GetNodeByID(parent->id()) != parent) { + BookmarkModel* model = GetBookmarkModel(profile); + if (GetBookmarkNodeByID(model, parent->id()) != parent) { LOG(ERROR) << "Node " << parent->GetTitle() << " does not belong to " << "Profile " << profile; return NULL; } - const BookmarkNode* result = GetBookmarkModel(profile)->AddFolder( - parent, index, base::WideToUTF16(title)); + const BookmarkNode* result = + model->AddFolder(parent, index, base::WideToUTF16(title)); EXPECT_TRUE(result); if (!result) { LOG(ERROR) << "Could not add folder " << title << " to Profile " @@ -477,7 +480,7 @@ const BookmarkNode* AddFolder(int profile, } if (test()->use_verifier()) { const BookmarkNode* v_parent = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent); + FindNodeInVerifier(model, parent, &v_parent); const BookmarkNode* v_node = GetVerifierBookmarkModel()->AddFolder( v_parent, index, base::WideToUTF16(title)); if (!v_node) { @@ -492,15 +495,16 @@ const BookmarkNode* AddFolder(int profile, void SetTitle(int profile, const BookmarkNode* node, const std::wstring& new_title) { - ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node) + BookmarkModel* model = GetBookmarkModel(profile); + ASSERT_EQ(GetBookmarkNodeByID(model, node->id()), node) << "Node " << node->GetTitle() << " does not belong to " << "Profile " << profile; if (test()->use_verifier()) { const BookmarkNode* v_node = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node); + FindNodeInVerifier(model, node, &v_node); GetVerifierBookmarkModel()->SetTitle(v_node, base::WideToUTF16(new_title)); } - GetBookmarkModel(profile)->SetTitle(node, base::WideToUTF16(new_title)); + model->SetTitle(node, base::WideToUTF16(new_title)); } void SetFavicon(int profile, @@ -508,17 +512,18 @@ void SetFavicon(int profile, const GURL& icon_url, const gfx::Image& image, FaviconSource favicon_source) { - ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node) + BookmarkModel* model = GetBookmarkModel(profile); + ASSERT_EQ(GetBookmarkNodeByID(model, node->id()), node) << "Node " << node->GetTitle() << " does not belong to " << "Profile " << profile; - ASSERT_EQ(BookmarkNode::URL, node->type()) - << "Node " << node->GetTitle() << " must be a url."; + ASSERT_EQ(BookmarkNode::URL, node->type()) << "Node " << node->GetTitle() + << " must be a url."; if (urls_with_favicons_ == NULL) urls_with_favicons_ = new std::set<GURL>(); urls_with_favicons_->insert(node->url()); if (test()->use_verifier()) { const BookmarkNode* v_node = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node); + FindNodeInVerifier(model, node, &v_node); SetFaviconImpl(test()->verifier(), v_node, icon_url, image, favicon_source); } SetFaviconImpl(test()->GetProfile(profile), node, icon_url, image, @@ -528,19 +533,20 @@ void SetFavicon(int profile, const BookmarkNode* SetURL(int profile, const BookmarkNode* node, const GURL& new_url) { - if (GetBookmarkModel(profile)->GetNodeByID(node->id()) != node) { + BookmarkModel* model = GetBookmarkModel(profile); + if (GetBookmarkNodeByID(model, node->id()) != node) { LOG(ERROR) << "Node " << node->GetTitle() << " does not belong to " << "Profile " << profile; return NULL; } if (test()->use_verifier()) { const BookmarkNode* v_node = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node); + FindNodeInVerifier(model, node, &v_node); if (v_node->is_url()) GetVerifierBookmarkModel()->SetURL(v_node, new_url); } if (node->is_url()) - GetBookmarkModel(profile)->SetURL(node, new_url); + model->SetURL(node, new_url); return node; } @@ -548,32 +554,32 @@ void Move(int profile, const BookmarkNode* node, const BookmarkNode* new_parent, int index) { - ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node) + BookmarkModel* model = GetBookmarkModel(profile); + ASSERT_EQ(GetBookmarkNodeByID(model, node->id()), node) << "Node " << node->GetTitle() << " does not belong to " << "Profile " << profile; if (test()->use_verifier()) { const BookmarkNode* v_new_parent = NULL; const BookmarkNode* v_node = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), new_parent, &v_new_parent); - FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node); + FindNodeInVerifier(model, new_parent, &v_new_parent); + FindNodeInVerifier(model, node, &v_node); GetVerifierBookmarkModel()->Move(v_node, v_new_parent, index); } - GetBookmarkModel(profile)->Move(node, new_parent, index); + model->Move(node, new_parent, index); } -void Remove(int profile, - const BookmarkNode* parent, - int index) { - ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(parent->id()), parent) +void Remove(int profile, const BookmarkNode* parent, int index) { + BookmarkModel* model = GetBookmarkModel(profile); + ASSERT_EQ(GetBookmarkNodeByID(model, parent->id()), parent) << "Node " << parent->GetTitle() << " does not belong to " << "Profile " << profile; if (test()->use_verifier()) { const BookmarkNode* v_parent = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent); + FindNodeInVerifier(model, parent, &v_parent); ASSERT_TRUE(NodesMatch(parent->GetChild(index), v_parent->GetChild(index))); GetVerifierBookmarkModel()->Remove(v_parent, index); } - GetBookmarkModel(profile)->Remove(parent, index); + model->Remove(parent, index); } void RemoveAll(int profile) { @@ -590,19 +596,21 @@ void RemoveAll(int profile) { } void SortChildren(int profile, const BookmarkNode* parent) { - ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(parent->id()), parent) + BookmarkModel* model = GetBookmarkModel(profile); + ASSERT_EQ(GetBookmarkNodeByID(model, parent->id()), parent) << "Node " << parent->GetTitle() << " does not belong to " << "Profile " << profile; if (test()->use_verifier()) { const BookmarkNode* v_parent = NULL; - FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent); + FindNodeInVerifier(model, parent, &v_parent); GetVerifierBookmarkModel()->SortChildren(v_parent); } - GetBookmarkModel(profile)->SortChildren(parent); + model->SortChildren(parent); } void ReverseChildOrder(int profile, const BookmarkNode* parent) { - ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(parent->id()), parent) + ASSERT_EQ(GetBookmarkNodeByID(GetBookmarkModel(profile), parent->id()), + parent) << "Node " << parent->GetTitle() << " does not belong to " << "Profile " << profile; int child_count = parent->child_count(); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index fe473f82..25b267f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -13,6 +13,7 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_stats.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_properties.h" @@ -1025,7 +1026,7 @@ void RecordAppLaunch(Profile* profile, GURL url) { - (IBAction)openBookmarkMenuItem:(id)sender { int64 tag = [self nodeIdFromMenuTag:[sender tag]]; - const BookmarkNode* node = bookmarkModel_->GetNodeByID(tag); + const BookmarkNode* node = GetBookmarkNodeByID(bookmarkModel_, tag); WindowOpenDisposition disposition = ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); [self openURL:node->url() disposition:disposition]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 52b110a..c99287c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -703,7 +703,7 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) { EXPECT_TRUE(item); if (item) { int64 tag = [bar_ nodeIdFromMenuTag:[item tag]]; - const BookmarkNode* node = model->GetNodeByID(tag); + const BookmarkNode* node = GetBookmarkNodeByID(model, tag); EXPECT_TRUE(node); EXPECT_EQ(gurl, node->url()); } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm index 3a62c85..9c3d35b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm @@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" @@ -161,7 +162,7 @@ using base::UserMetricsAction; const BookmarkModel* const model = [[self controller] bookmarkModel]; const BookmarkNode* const source_node = [button bookmarkNode]; const BookmarkNode* const target_node = - model->GetNodeByID(source_node->id()); + GetBookmarkNodeByID(model, source_node->id()); BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove) || diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm index 651f35d..8b78dd4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm @@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/themes/theme_properties.h" #import "chrome/browser/themes/theme_service.h" @@ -226,7 +227,7 @@ using base::UserMetricsAction; const BookmarkModel* const model = [[self controller] bookmarkModel]; const BookmarkNode* const source_node = [button bookmarkNode]; const BookmarkNode* const target_node = - model->GetNodeByID(source_node->id()); + GetBookmarkNodeByID(model, source_node->id()); BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove) || diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index e5b391a..43a49e2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm @@ -7,7 +7,7 @@ #include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU #import "chrome/browser/app_controller_mac.h" -#include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" @@ -80,7 +80,7 @@ const NSUInteger kMaximumMenuPixelsWide = 300; // Return the a BookmarkNode that has the given id (called // "identifier" here to avoid conflict with objc's concept of "id"). - (const BookmarkNode*)nodeForIdentifier:(int)identifier { - return bridge_->GetBookmarkModel()->GetNodeByID(identifier); + return GetBookmarkNodeByID(bridge_->GetBookmarkModel(), identifier); } // Open the URL of the given BookmarkNode in the current tab. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index ecac9bf..8e0f5a1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -208,7 +208,7 @@ void BookmarkEditorView::ExecuteCommand(int command_id, int event_flags) { if (!node) return; if (node->value != 0) { - const BookmarkNode* b_node = bb_model_->GetNodeByID(node->value); + const BookmarkNode* b_node = GetBookmarkNodeByID(bb_model_, node->value); if (!b_node->empty() && !chrome::ConfirmDeleteBookmarkNode(b_node, GetWidget()->GetNativeWindow())) { @@ -608,8 +608,9 @@ void BookmarkEditorView::UpdateExpandedNodes( if (!tree_view_->IsExpanded(editor_node)) return; - if (editor_node->value != 0) // The root is 0 - expanded_nodes->insert(bb_model_->GetNodeByID(editor_node->value)); + if (editor_node->value != 0) // The root is 0. + expanded_nodes->insert(GetBookmarkNodeByID(bb_model_, editor_node->value)); + for (int i = 0; i < editor_node->child_count(); ++i) UpdateExpandedNodes(editor_node->GetChild(i), expanded_nodes); } diff --git a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc index b9eaef4..ef43cf0 100644 --- a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc +++ b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc @@ -13,6 +13,7 @@ #include "chrome/browser/android/tab_android.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" @@ -520,7 +521,7 @@ const BookmarkNode* BookmarksHandler::GetNodeByID( if (is_partner) return partner_bookmarks_shim_->GetNodeByID(id); - return bookmark_model_->GetNodeByID(id); + return GetBookmarkNodeByID(bookmark_model_, id); } const BookmarkNode* BookmarksHandler::GetParentOf( diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc index 1c66faa..90bcd93 100644 --- a/chrome/browser/undo/bookmark_undo_service.cc +++ b/chrome/browser/undo/bookmark_undo_service.cc @@ -81,7 +81,7 @@ BookmarkAddOperation::BookmarkAddOperation(Profile* profile, void BookmarkAddOperation::Undo() { BookmarkModel* model = GetBookmarkModel(); - const BookmarkNode* parent = model->GetNodeByID(parent_id_); + const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_); DCHECK(parent); model->Remove(parent, index_); @@ -147,7 +147,7 @@ BookmarkRemoveOperation::BookmarkRemoveOperation(Profile* profile, void BookmarkRemoveOperation::Undo() { DCHECK(removed_node_.is_valid()); BookmarkModel* model = GetBookmarkModel(); - const BookmarkNode* parent = model->GetNodeByID(parent_id_); + const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_); DCHECK(parent); bookmark_utils::CloneBookmarkNode(model, removed_node_.elements, parent, @@ -215,7 +215,7 @@ BookmarkEditOperation::BookmarkEditOperation(Profile* profile, void BookmarkEditOperation::Undo() { DCHECK(original_bookmark_.is_valid()); BookmarkModel* model = GetBookmarkModel(); - const BookmarkNode* node = model->GetNodeByID(node_id_); + const BookmarkNode* node = GetBookmarkNodeByID(model, node_id_); DCHECK(node); model->SetTitle(node, original_bookmark_.elements[0].title); @@ -279,8 +279,8 @@ BookmarkMoveOperation::BookmarkMoveOperation(Profile* profile, void BookmarkMoveOperation::Undo() { BookmarkModel* model = GetBookmarkModel(); - const BookmarkNode* old_parent = model->GetNodeByID(old_parent_id_); - const BookmarkNode* new_parent = model->GetNodeByID(new_parent_id_); + const BookmarkNode* old_parent = GetBookmarkNodeByID(model, old_parent_id_); + const BookmarkNode* new_parent = GetBookmarkNodeByID(model, new_parent_id_); DCHECK(old_parent); DCHECK(new_parent); @@ -352,12 +352,12 @@ BookmarkReorderOperation::~BookmarkReorderOperation() { void BookmarkReorderOperation::Undo() { BookmarkModel* model = GetBookmarkModel(); - const BookmarkNode* parent = model->GetNodeByID(parent_id_); + const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_); DCHECK(parent); std::vector<const BookmarkNode*> ordered_nodes; for (size_t i = 0; i < ordered_bookmarks_.size(); ++i) - ordered_nodes.push_back(model->GetNodeByID(ordered_bookmarks_[i])); + ordered_nodes.push_back(GetBookmarkNodeByID(model, ordered_bookmarks_[i])); model->ReorderChildren(parent, ordered_nodes); } |