summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/accessibility/browser_accessibility.cc2
-rw-r--r--chrome/browser/accessibility/browser_accessibility.h2
-rw-r--r--chrome/browser/accessibility/browser_accessibility_cocoa.mm6
-rw-r--r--chrome/browser/accessibility/browser_accessibility_manager.cc2
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc2
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller.cc6
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc20
-rw-r--r--chrome/browser/bookmarks/bookmark_model.cc6
-rw-r--r--chrome/browser/bookmarks/bookmark_model_unittest.cc8
-rw-r--r--chrome/browser/bookmarks/bookmark_utils.cc8
-rw-r--r--chrome/browser/bookmarks/recently_used_folders_combo_model.cc10
-rw-r--r--chrome/browser/cookies_tree_model.cc30
-rw-r--r--chrome/browser/cookies_tree_model_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_bookmark_helpers.cc4
-rw-r--r--chrome/browser/extensions/extension_bookmark_manager_api.cc2
-rw-r--r--chrome/browser/extensions/extension_bookmarks_module.cc8
-rw-r--r--chrome/browser/external_tab_container_win.cc3
-rw-r--r--chrome/browser/importer/profile_writer.cc4
-rw-r--r--chrome/browser/sync/glue/bookmark_change_processor.cc20
-rw-r--r--chrome/browser/sync/profile_sync_service_unittest.cc18
-rw-r--r--chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm16
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm6
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm4
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm8
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm4
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm12
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/browser_window_controller.mm2
-rw-r--r--chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm2
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc10
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc4
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc4
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc2
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc6
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc4
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc6
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc20
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc4
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc8
-rw-r--r--chrome/browser/ui/views/browser_actions_container.cc2
-rw-r--r--chrome/test/live_sync/bookmark_model_verifier.cc18
-rw-r--r--chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc6
-rw-r--r--ui/base/models/tree_node_model.h14
48 files changed, 166 insertions, 171 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility.cc b/chrome/browser/accessibility/browser_accessibility.cc
index bd3c690..7d869e1 100644
--- a/chrome/browser/accessibility/browser_accessibility.cc
+++ b/chrome/browser/accessibility/browser_accessibility.cc
@@ -97,7 +97,7 @@ bool BrowserAccessibility::IsDescendantOf(
return false;
}
-BrowserAccessibility* BrowserAccessibility::GetParent() {
+BrowserAccessibility* BrowserAccessibility::parent() {
return parent_;
}
diff --git a/chrome/browser/accessibility/browser_accessibility.h b/chrome/browser/accessibility/browser_accessibility.h
index fd2f1e1..4085e32 100644
--- a/chrome/browser/accessibility/browser_accessibility.h
+++ b/chrome/browser/accessibility/browser_accessibility.h
@@ -75,7 +75,7 @@ class BrowserAccessibility {
bool IsDescendantOf(BrowserAccessibility* ancestor);
// Returns the parent of this object, or NULL if it's the root.
- BrowserAccessibility* GetParent();
+ BrowserAccessibility* parent();
// Returns the number of children of this object.
uint32 GetChildCount();
diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm
index 30a8f7d..81f82ca 100644
--- a/chrome/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm
@@ -112,7 +112,7 @@ bool GetState(BrowserAccessibility* accessibility, int state) {
if (![self isIgnored]) {
children_.reset();
} else {
- [browserAccessibility_->GetParent()->toBrowserAccessibilityCocoa()
+ [browserAccessibility_->parent()->toBrowserAccessibilityCocoa()
childrenChanged];
}
}
@@ -201,9 +201,9 @@ bool GetState(BrowserAccessibility* accessibility, int state) {
}
if ([attribute isEqualToString:NSAccessibilityParentAttribute]) {
// A nil parent means we're the root.
- if (browserAccessibility_->GetParent()) {
+ if (browserAccessibility_->parent()) {
return NSAccessibilityUnignoredAncestor(
- browserAccessibility_->GetParent()->toBrowserAccessibilityCocoa());
+ browserAccessibility_->parent()->toBrowserAccessibilityCocoa());
} else {
// Hook back up to RenderWidgetHostViewCocoa.
return browserAccessibility_->manager()->GetParentView();
diff --git a/chrome/browser/accessibility/browser_accessibility_manager.cc b/chrome/browser/accessibility/browser_accessibility_manager.cc
index f2c1bbc..b558659 100644
--- a/chrome/browser/accessibility/browser_accessibility_manager.cc
+++ b/chrome/browser/accessibility/browser_accessibility_manager.cc
@@ -274,7 +274,7 @@ BrowserAccessibility* BrowserAccessibilityManager::UpdateNode(
DCHECK_EQ(0U, src.children.size());
current->Initialize(
this,
- current->GetParent(),
+ current->parent(),
current->child_id(),
current->index_in_parent(),
src);
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 7274b7c..10daa98 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -1794,7 +1794,7 @@ void TestingAutomationProvider::RemoveBookmark(int handle,
const BookmarkNode* node = model->GetNodeByID(id);
DCHECK(node);
if (node) {
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
DCHECK(parent);
model->Remove(parent, parent->GetIndexOf(node));
*success = true;
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
index fb9e684..ed85f4b 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
@@ -158,8 +158,8 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
profile_);
for (size_t i = 0; i < selection_.size(); ++i) {
- model_->Remove(selection_[i]->GetParent(),
- selection_[i]->GetParent()->GetIndexOf(selection_[i]));
+ model_->Remove(selection_[i]->parent(),
+ selection_[i]->parent()->GetIndexOf(selection_[i]));
}
selection_.clear();
break;
@@ -241,7 +241,7 @@ bool BookmarkContextMenuController::IsCommandIdChecked(int command_id) const {
bool BookmarkContextMenuController::IsCommandIdEnabled(int command_id) const {
bool is_root_node =
(selection_.size() == 1 &&
- selection_[0]->GetParent() == model_->root_node());
+ selection_[0]->parent() == model_->root_node());
switch (command_id) {
case IDC_BOOKMARK_BAR_OPEN_INCOGNITO:
return !profile_->IsOffTheRecord() &&
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index e73f6d9..059c16d 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -108,7 +108,7 @@ TEST_F(BookmarkContextMenuControllerTest, DeleteURL) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenuController controller(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetURL();
ASSERT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
// Delete the URL.
@@ -153,7 +153,7 @@ TEST_F(BookmarkContextMenuControllerTest, SingleURL) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenuController controller(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -173,7 +173,7 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleURLs) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(1)->GetChild(0));
BookmarkContextMenuController controller(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -192,7 +192,7 @@ TEST_F(BookmarkContextMenuControllerTest, SingleFolder) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
BookmarkContextMenuController controller(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -212,7 +212,7 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleEmptyFolders) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
BookmarkContextMenuController controller(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -232,7 +232,7 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleFoldersWithURLs) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(4));
BookmarkContextMenuController controller(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -250,7 +250,7 @@ TEST_F(BookmarkContextMenuControllerTest, DisableIncognito) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenuController controller(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
profile_->set_off_the_record(true);
EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_INCOGNITO));
EXPECT_FALSE(
@@ -290,7 +290,7 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
scoped_ptr<BookmarkContextMenuController> controller(
new BookmarkContextMenuController(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
EXPECT_TRUE(controller->IsCommandIdEnabled(IDC_COPY));
EXPECT_TRUE(controller->IsCommandIdEnabled(IDC_CUT));
@@ -298,7 +298,7 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
controller->ExecuteCommand(IDC_COPY);
controller.reset(new BookmarkContextMenuController(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
int old_count = model_->GetBookmarkBarNode()->GetChildCount();
controller->ExecuteCommand(IDC_PASTE);
@@ -308,7 +308,7 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
model_->GetBookmarkBarNode()->GetChild(1)->GetURL());
controller.reset(new BookmarkContextMenuController(
- NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
+ NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
// Cut the URL.
controller->ExecuteCommand(IDC_CUT);
ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index e1c988d..15c4101 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -193,7 +193,7 @@ void BookmarkModel::Move(const BookmarkNode* node,
SetDateGroupModified(new_parent, Time::Now());
- const BookmarkNode* old_parent = node->GetParent();
+ const BookmarkNode* old_parent = node->parent();
int old_index = old_parent->GetIndexOf(node);
if (old_parent == new_parent &&
@@ -468,7 +468,7 @@ void BookmarkModel::SetURLStarred(const GURL& url,
// Remove all the bookmarks.
for (size_t i = 0; i < bookmarks.size(); ++i) {
const BookmarkNode* node = bookmarks[i];
- Remove(node->GetParent(), node->GetParent()->GetIndexOf(node));
+ Remove(node->parent(), node->parent()->GetIndexOf(node));
}
}
}
@@ -596,7 +596,7 @@ void BookmarkModel::DoneLoading(
void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* delete_me) {
scoped_ptr<BookmarkNode> node(delete_me);
- BookmarkNode* parent = AsMutable(node->GetParent());
+ BookmarkNode* parent = AsMutable(node->parent());
DCHECK(parent);
int index = parent->GetIndexOf(node.get());
parent->Remove(index);
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 562cd47..2cf7898 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -303,7 +303,7 @@ TEST_F(BookmarkModelTest, Move) {
AssertObserverCount(0, 1, 0, 0, 0);
observer_details.AssertEquals(root, group1, 1, 0);
- EXPECT_TRUE(group1 == node->GetParent());
+ EXPECT_TRUE(group1 == node->parent());
EXPECT_EQ(1, root->GetChildCount());
EXPECT_EQ(group1, root->GetChild(0));
EXPECT_EQ(1, group1->GetChildCount());
@@ -399,7 +399,7 @@ TEST_F(BookmarkModelTest, MostRecentlyModifiedGroups) {
// Nuke the group and do another fetch, making sure group isn't in the
// returned list.
- model.Remove(group->GetParent(), 0);
+ model.Remove(group->parent(), 0);
most_recent_groups =
bookmark_utils::GetMostRecentlyModifiedGroups(&model, 1);
ASSERT_EQ(1U, most_recent_groups.size());
@@ -546,7 +546,7 @@ TEST_F(BookmarkModelTest, NotifyURLsStarred) {
EXPECT_EQ(0, listener.notification_count_);
// Remove n2.
- model.Remove(n2->GetParent(), 1);
+ model.Remove(n2->parent(), 1);
n2 = NULL;
// Shouldn't have received any notification as n1 still exists with the same
@@ -556,7 +556,7 @@ TEST_F(BookmarkModelTest, NotifyURLsStarred) {
EXPECT_TRUE(model.GetMostRecentlyAddedNodeForURL(url) == n1);
// Remove n1.
- model.Remove(n1->GetParent(), 0);
+ model.Remove(n1->parent(), 0);
// Now we should get the notification.
EXPECT_EQ(1, listener.notification_count_);
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 672d4da..2b8a27d 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -291,7 +291,7 @@ bool IsValidDropLocation(Profile* profile,
// Don't allow the drop if the user is attempting to drop on one of the
// nodes being dragged.
const BookmarkNode* node = nodes[i];
- int node_index = (drop_parent == node->GetParent()) ?
+ int node_index = (drop_parent == node->parent()) ?
drop_parent->GetIndexOf(nodes[i]) : -1;
if (node_index != -1 && (index == node_index || index == node_index + 1))
return false;
@@ -403,8 +403,8 @@ void CopyToClipboard(BookmarkModel* model,
if (remove_nodes) {
for (size_t i = 0; i < nodes.size(); ++i) {
- model->Remove(nodes[i]->GetParent(),
- nodes[i]->GetParent()->GetIndexOf(nodes[i]));
+ model->Remove(nodes[i]->parent(),
+ nodes[i]->parent()->GetIndexOf(nodes[i]));
}
}
}
@@ -591,7 +591,7 @@ const BookmarkNode* ApplyEditsWithPossibleGroupChange(BookmarkModel* model,
const BookmarkNode* node = details.existing_node;
DCHECK(node);
- if (new_parent != node->GetParent())
+ if (new_parent != node->parent())
model->Move(node, new_parent, new_parent->GetChildCount());
if (node->is_url())
model->SetURL(node, new_url);
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
index 172e779..ca227ba 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
@@ -27,12 +27,12 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
// fix up the order.
RemoveNode(model->GetBookmarkBarNode());
RemoveNode(model->other_node());
- RemoveNode(node->GetParent());
+ RemoveNode(node->parent());
// Make the parent the first item, unless it's the bookmark bar or other node.
- if (node->GetParent() != model->GetBookmarkBarNode() &&
- node->GetParent() != model->other_node()) {
- nodes_.insert(nodes_.begin(), node->GetParent());
+ if (node->parent() != model->GetBookmarkBarNode() &&
+ node->parent() != model->other_node()) {
+ nodes_.insert(nodes_.begin(), node->parent());
}
// Make sure we only have kMaxMRUFolders in the first chunk.
@@ -45,7 +45,7 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(),
nodes_.end(),
- node->GetParent());
+ node->parent());
node_parent_index_ = static_cast<int>(it - nodes_.begin());
}
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index 357143e..a31e903 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -36,8 +36,8 @@ void CookieTreeNode::DeleteStoredObjects() {
}
CookiesTreeModel* CookieTreeNode::GetModel() const {
- if (GetParent())
- return GetParent()->GetModel();
+ if (parent())
+ return parent()->GetModel();
else
return NULL;
}
@@ -65,7 +65,7 @@ void CookieTreeCookieNode::DeleteStoredObjects() {
}
CookieTreeNode::DetailedInfo CookieTreeCookieNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetParent()->GetTitle(),
+ return DetailedInfo(parent()->parent()->GetTitle(),
DetailedInfo::TYPE_COOKIE,
cookie_, NULL, NULL, NULL, NULL, NULL);
}
@@ -145,7 +145,7 @@ void CookieTreeAppCacheNode::DeleteStoredObjects() {
}
CookieTreeNode::DetailedInfo CookieTreeAppCacheNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetParent()->GetTitle(),
+ return DetailedInfo(parent()->parent()->GetTitle(),
DetailedInfo::TYPE_APPCACHE,
NULL, NULL, NULL, NULL, appcache_info_, NULL);
}
@@ -169,7 +169,7 @@ void CookieTreeDatabaseNode::DeleteStoredObjects() {
}
CookieTreeNode::DetailedInfo CookieTreeDatabaseNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetParent()->GetTitle(),
+ return DetailedInfo(parent()->parent()->GetTitle(),
DetailedInfo::TYPE_DATABASE,
NULL, database_info_, NULL, NULL, NULL, NULL);
}
@@ -195,7 +195,7 @@ void CookieTreeLocalStorageNode::DeleteStoredObjects() {
CookieTreeNode::DetailedInfo
CookieTreeLocalStorageNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetParent()->GetTitle(),
+ return DetailedInfo(parent()->parent()->GetTitle(),
DetailedInfo::TYPE_LOCAL_STORAGE,
NULL, NULL, local_storage_info_, NULL, NULL, NULL);
}
@@ -216,7 +216,7 @@ CookieTreeSessionStorageNode::~CookieTreeSessionStorageNode() {}
CookieTreeNode::DetailedInfo
CookieTreeSessionStorageNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetParent()->GetTitle(),
+ return DetailedInfo(parent()->parent()->GetTitle(),
DetailedInfo::TYPE_SESSION_STORAGE,
NULL, NULL, NULL, session_storage_info_, NULL, NULL);
}
@@ -241,7 +241,7 @@ void CookieTreeIndexedDBNode::DeleteStoredObjects() {
}
CookieTreeNode::DetailedInfo CookieTreeIndexedDBNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetParent()->GetTitle(),
+ return DetailedInfo(parent()->parent()->GetTitle(),
DetailedInfo::TYPE_INDEXED_DB,
NULL, NULL, NULL, NULL, NULL, indexed_db_info_);
}
@@ -390,7 +390,7 @@ CookieTreeCookiesNode::~CookieTreeCookiesNode() {
}
CookieTreeNode::DetailedInfo CookieTreeCookiesNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetTitle(),
+ return DetailedInfo(parent()->GetTitle(),
DetailedInfo::TYPE_COOKIES,
NULL, NULL, NULL, NULL, NULL, NULL);
}
@@ -406,7 +406,7 @@ CookieTreeAppCachesNode::CookieTreeAppCachesNode()
CookieTreeAppCachesNode::~CookieTreeAppCachesNode() {}
CookieTreeNode::DetailedInfo CookieTreeAppCachesNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetTitle(),
+ return DetailedInfo(parent()->GetTitle(),
DetailedInfo::TYPE_APPCACHES,
NULL, NULL, NULL, NULL, NULL, NULL);
}
@@ -421,7 +421,7 @@ CookieTreeDatabasesNode::CookieTreeDatabasesNode()
CookieTreeDatabasesNode::~CookieTreeDatabasesNode() {}
CookieTreeNode::DetailedInfo CookieTreeDatabasesNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetTitle(),
+ return DetailedInfo(parent()->GetTitle(),
DetailedInfo::TYPE_DATABASES,
NULL, NULL, NULL, NULL, NULL, NULL);
}
@@ -437,7 +437,7 @@ CookieTreeLocalStoragesNode::~CookieTreeLocalStoragesNode() {}
CookieTreeNode::DetailedInfo
CookieTreeLocalStoragesNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetTitle(),
+ return DetailedInfo(parent()->GetTitle(),
DetailedInfo::TYPE_LOCAL_STORAGES,
NULL, NULL, NULL, NULL, NULL, NULL);
}
@@ -453,7 +453,7 @@ CookieTreeSessionStoragesNode::~CookieTreeSessionStoragesNode() {}
CookieTreeNode::DetailedInfo
CookieTreeSessionStoragesNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetTitle(),
+ return DetailedInfo(parent()->GetTitle(),
DetailedInfo::TYPE_SESSION_STORAGES,
NULL, NULL, NULL, NULL, NULL, NULL);
}
@@ -469,7 +469,7 @@ CookieTreeIndexedDBsNode::~CookieTreeIndexedDBsNode() {}
CookieTreeNode::DetailedInfo
CookieTreeIndexedDBsNode::GetDetailedInfo() const {
- return DetailedInfo(GetParent()->GetTitle(),
+ return DetailedInfo(parent()->GetTitle(),
DetailedInfo::TYPE_INDEXED_DBS,
NULL, NULL, NULL, NULL, NULL, NULL);
}
@@ -643,7 +643,7 @@ void CookiesTreeModel::DeleteCookieNode(CookieTreeNode* cookie_node) {
return;
cookie_node->DeleteStoredObjects();
// find the parent and index
- CookieTreeNode* parent_node = cookie_node->GetParent();
+ CookieTreeNode* parent_node = cookie_node->parent();
int cookie_node_index = parent_node->GetIndexOf(cookie_node);
delete Remove(parent_node, cookie_node_index);
if (parent_node->GetChildCount() == 0)
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index dd44b52..cfab323 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -207,7 +207,7 @@ class CookiesTreeModelTest : public testing::Test {
void DeleteStoredObjects(CookieTreeNode* node) {
node->DeleteStoredObjects();
// find the parent and index
- CookieTreeNode* parent_node = node->GetParent();
+ CookieTreeNode* parent_node = node->parent();
DCHECK(parent_node);
int ct_node_index = parent_node->GetIndexOf(node);
delete parent_node->GetModel()->Remove(parent_node, ct_node_index);
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/extensions/extension_bookmark_helpers.cc
index 6829cc4..eeceed8 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.cc
+++ b/chrome/browser/extensions/extension_bookmark_helpers.cc
@@ -20,7 +20,7 @@ DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
DictionaryValue* dict = new DictionaryValue();
dict->SetString(keys::kIdKey, base::Int64ToString(node->id()));
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
if (parent) {
dict->SetString(keys::kParentIdKey, base::Int64ToString(parent->id()));
dict->SetInteger(keys::kIndexKey, parent->GetIndexOf(node));
@@ -100,7 +100,7 @@ bool RemoveNode(BookmarkModel* model,
return false;
}
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
int index = parent->GetIndexOf(node);
model->Remove(parent, index);
return true;
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc
index bdb960d..d351739 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc
@@ -80,7 +80,7 @@ void AddNodeToList(ListValue* list, const BookmarkNode& node) {
std::string id_string = base::Int64ToString(node.id());
dict->SetString(keys::kIdKey, id_string);
- std::string parent_id_string = base::Int64ToString(node.GetParent()->id());
+ std::string parent_id_string = base::Int64ToString(node.parent()->id());
dict->SetString(keys::kParentIdKey, parent_id_string);
if (node.is_url())
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index 706eb36..8616457 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -436,7 +436,7 @@ bool CreateBookmarkFunction::RunImpl() {
error_ = keys::kNoParentError;
return false;
}
- if (parent->GetParent() == NULL) { // Can't create children of the root.
+ if (parent->parent() == NULL) { // Can't create children of the root.
error_ = keys::kNoParentError;
return false;
}
@@ -517,7 +517,7 @@ bool MoveBookmarkFunction::RunImpl() {
const BookmarkNode* parent = NULL;
if (!destination->HasKey(keys::kParentIdKey)) {
// Optional, defaults to current parent.
- parent = node->GetParent();
+ parent = node->parent();
} else {
std::string parentId_string;
EXTENSION_FUNCTION_VALIDATE(destination->GetString(keys::kParentIdKey,
@@ -692,11 +692,11 @@ class RemoveBookmarksBucketMapper : public BookmarkBucketMapper<std::string> {
for (IdList::iterator it = ids.begin(); it != ids.end(); ++it) {
BookmarkModel* model = profile_->GetBookmarkModel();
const BookmarkNode* node = model->GetNodeByID(*it);
- if (!node || !node->GetParent())
+ if (!node || !node->parent())
return;
std::string bucket_id;
- bucket_id += UTF16ToUTF8(node->GetParent()->GetTitle());
+ bucket_id += UTF16ToUTF8(node->parent()->GetTitle());
bucket_id += UTF16ToUTF8(node->GetTitle());
bucket_id += node->GetURL().spec();
buckets->push_back(GetBucket(base::SHA1HashString(bucket_id)));
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index 5888100..494a8e1 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -686,8 +686,7 @@ void ExternalTabContainer::ShowHtmlDialog(HtmlDialogUIDelegate* delegate,
tab_contents_->profile()));
}
- gfx::NativeWindow parent = parent_window ? parent_window
- : GetParent();
+ gfx::NativeWindow parent = parent_window ? parent_window : GetParent();
browser_->window()->ShowHTMLDialog(delegate, parent);
}
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 1ea2c46..c5e752c 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -334,7 +334,7 @@ bool ProfileWriter::DoesBookmarkExist(
// Does the path match?
bool found_match = true;
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
for (std::vector<std::wstring>::const_reverse_iterator path_it =
entry.path.rbegin();
(path_it != entry.path.rend()) && found_match; ++path_it) {
@@ -344,7 +344,7 @@ bool ProfileWriter::DoesBookmarkExist(
if (NULL == parent || *path_it != folder_name)
found_match = false;
else
- parent = parent->GetParent();
+ parent = parent->parent();
}
// We need a post test to differentiate checks such as
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 316fb3d..6ff25f6 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -95,7 +95,7 @@ void BookmarkChangeProcessor::RemoveSyncNodeHierarchy(
sync_api::WriteTransaction trans(share_handle());
// Later logic assumes that |topmost| has been unlinked.
- DCHECK(!topmost->GetParent());
+ DCHECK(!topmost->parent());
// A BookmarkModel deletion event means that |node| and all its children were
// deleted. Sync backend expects children to be deleted individually, so we do
@@ -107,13 +107,13 @@ void BookmarkChangeProcessor::RemoveSyncNodeHierarchy(
int index = 0;
while (node) {
// The top of |index_stack| should always be |node|'s index.
- DCHECK(!node->GetParent() || (node->GetParent()->GetIndexOf(node) ==
+ DCHECK(!node->parent() || (node->parent()->GetIndexOf(node) ==
index_stack.top()));
if (index == node->GetChildCount()) {
// If we've processed all of |node|'s children, delete |node| and move
// on to its successor.
RemoveOneSyncNode(&trans, node);
- node = node->GetParent();
+ node = node->parent();
index = index_stack.top() + 1; // (top() + 0) was what we removed.
index_stack.pop();
} else {
@@ -212,10 +212,10 @@ void BookmarkChangeProcessor::BookmarkNodeChanged(BookmarkModel* model,
DCHECK_EQ(sync_node.GetIsFolder(), node->is_folder());
DCHECK_EQ(model_associator_->GetChromeNodeFromSyncId(
sync_node.GetParentId()),
- node->GetParent());
+ node->parent());
// This node's index should be one more than the predecessor's index.
- DCHECK_EQ(node->GetParent()->GetIndexOf(node),
- CalculateBookmarkModelInsertionIndex(node->GetParent(),
+ DCHECK_EQ(node->parent()->GetIndexOf(node),
+ CalculateBookmarkModelInsertionIndex(node->parent(),
&sync_node));
}
@@ -342,7 +342,7 @@ int BookmarkChangeProcessor::CalculateBookmarkModelInsertionIndex(
const BookmarkNode* predecessor =
model_associator_->GetChromeNodeFromSyncId(predecessor_id);
DCHECK(predecessor);
- DCHECK_EQ(predecessor->GetParent(), parent);
+ DCHECK_EQ(predecessor->parent(), parent);
return parent->GetIndexOf(predecessor) + 1;
}
@@ -396,7 +396,7 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel(
// Children of a deleted node should not be deleted; they may be
// reparented by a later change record. Move them to a temporary place.
DCHECK(dst) << "Could not find node to be deleted";
- const BookmarkNode* parent = dst->GetParent();
+ const BookmarkNode* parent = dst->parent();
if (dst->GetChildCount()) {
if (!foster_parent) {
foster_parent = model->AddGroup(model->other_node(),
@@ -431,8 +431,8 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel(
if (foster_parent) {
// There should be no nodes left under the foster parent.
DCHECK_EQ(foster_parent->GetChildCount(), 0);
- model->Remove(foster_parent->GetParent(),
- foster_parent->GetParent()->GetIndexOf(foster_parent));
+ model->Remove(foster_parent->parent(),
+ foster_parent->parent()->GetIndexOf(foster_parent));
foster_parent = NULL;
}
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 07c0ceb..927b0d5 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -385,30 +385,30 @@ class ProfileSyncServiceTest : public testing::Test {
bnode != model_->other_node()) {
EXPECT_EQ(bnode->GetTitle(), WideToUTF16Hack(gnode.GetTitle()));
EXPECT_EQ(associator()->GetChromeNodeFromSyncId(gnode.GetParentId()),
- bnode->GetParent());
+ bnode->parent());
}
EXPECT_EQ(bnode->is_folder(), gnode.GetIsFolder());
if (bnode->is_url())
EXPECT_EQ(bnode->GetURL(), gnode.GetURL());
// Check for position matches.
- int browser_index = bnode->GetParent()->GetIndexOf(bnode);
+ int browser_index = bnode->parent()->GetIndexOf(bnode);
if (browser_index == 0) {
EXPECT_EQ(gnode.GetPredecessorId(), 0);
} else {
const BookmarkNode* bprev =
- bnode->GetParent()->GetChild(browser_index - 1);
+ bnode->parent()->GetChild(browser_index - 1);
sync_api::ReadNode gprev(trans);
ASSERT_TRUE(associator()->InitSyncNodeFromChromeId(bprev->id(),
&gprev));
EXPECT_EQ(gnode.GetPredecessorId(), gprev.GetId());
EXPECT_EQ(gnode.GetParentId(), gprev.GetParentId());
}
- if (browser_index == bnode->GetParent()->GetChildCount() - 1) {
+ if (browser_index == bnode->parent()->GetChildCount() - 1) {
EXPECT_EQ(gnode.GetSuccessorId(), 0);
} else {
const BookmarkNode* bnext =
- bnode->GetParent()->GetChild(browser_index + 1);
+ bnode->parent()->GetChild(browser_index + 1);
sync_api::ReadNode gnext(trans);
ASSERT_TRUE(associator()->InitSyncNodeFromChromeId(bnext->id(),
&gnext));
@@ -474,7 +474,7 @@ class ProfileSyncServiceTest : public testing::Test {
const BookmarkNode* parent =
associator()->GetChromeNodeFromSyncId(parent_sync_id);
EXPECT_TRUE(parent);
- EXPECT_EQ(node->GetParent(), parent);
+ EXPECT_EQ(node->parent(), parent);
}
void ExpectModelMatch(sync_api::BaseTransaction* trans) {
@@ -613,11 +613,11 @@ TEST_F(ProfileSyncServiceTest, BookmarkModelOperations) {
// Test deletion.
// Delete a single item.
- model_->Remove(url2->GetParent(), url2->GetParent()->GetIndexOf(url2));
+ model_->Remove(url2->parent(), url2->parent()->GetIndexOf(url2));
ExpectModelMatch();
// Delete an item with several children.
- model_->Remove(folder2->GetParent(),
- folder2->GetParent()->GetIndexOf(folder2));
+ model_->Remove(folder2->parent(),
+ folder2->parent()->GetIndexOf(folder2));
ExpectModelMatch();
}
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm
index ff43be5..56b38c7 100644
--- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm
@@ -103,7 +103,7 @@
}
- (NSNumber*)index {
- const BookmarkNode* parent = bookmarkNode_->GetParent();
+ const BookmarkNode* parent = bookmarkNode_->parent();
int index = parent->GetIndexOf(bookmarkNode_);
// NOTE: AppleScript is 1-Based.
return [NSNumber numberWithInt:index+1];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index e63b645..bfa141a 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -288,7 +288,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
[otherBookmarksButton_ setIsContinuousPulsing:doPulse];
return;
}
- if (node->GetParent() == bookmarkModel_->GetBookmarkBarNode()) {
+ if (node->parent() == bookmarkModel_->GetBookmarkBarNode()) {
[offTheSideButton_ setIsContinuousPulsing:doPulse];
return;
}
@@ -612,7 +612,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
// UI.
BookmarkEditor::Show([[self view] window],
browser_->profile(),
- node->GetParent(),
+ node->parent(),
BookmarkEditor::EditDetails(node),
BookmarkEditor::SHOW_TREE);
}
@@ -643,7 +643,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
if (node) {
int index = -1;
if (node != bookmarkModel_->GetBookmarkBarNode() && !node->is_folder()) {
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
index = parent->GetIndexOf(node) + 1;
if (index > parent->GetChildCount())
index = -1;
@@ -656,8 +656,8 @@ void RecordAppLaunch(Profile* profile, GURL url) {
- (IBAction)deleteBookmark:(id)sender {
const BookmarkNode* node = [self nodeFromMenuItem:sender];
if (node) {
- bookmarkModel_->Remove(node->GetParent(),
- node->GetParent()->GetIndexOf(node));
+ bookmarkModel_->Remove(node->parent(),
+ node->parent()->GetIndexOf(node));
}
}
@@ -719,7 +719,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
parent = senderNode;
newIndex = parent->GetChildCount();
} else {
- parent = senderNode->GetParent();
+ parent = senderNode->parent();
newIndex = parent->GetIndexOf(senderNode) + 1;
}
BookmarkNameFolderController* controller =
@@ -1758,7 +1758,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
const BookmarkNode* afterNode =
[buttonToTheRightOfDraggedButton bookmarkNode];
DCHECK(afterNode);
- int index = afterNode->GetParent()->GetIndexOf(afterNode);
+ int index = afterNode->parent()->GetIndexOf(afterNode);
// Make sure we don't get confused by buttons which aren't visible.
return std::min(index, displayedButtonCount_);
}
@@ -2063,7 +2063,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
// http://crbug.com/35966
const BookmarkNode* node = [button bookmarkNode];
if (node) {
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
bookmarkModel_->Remove(parent,
parent->GetIndexOf(node));
}
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 0b187ab..7ff8540 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -1563,7 +1563,7 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileContextMenuIsOpen) {
[bar_ setButtonContextMenu:fakeMenu];
// Force a delete which should cancelTracking on the menu.
- model->Remove(framma->GetParent(), framma->GetParent()->GetIndexOf(framma));
+ model->Remove(framma->parent(), framma->parent()->GetIndexOf(framma));
// Restore, then confirm cancelTracking was called.
[bar_ setButtonContextMenu:origMenu];
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 e91db0f..76b7dca 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -1156,7 +1156,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
bookmarkNode];
DCHECK(beforeNode);
// Be careful if the number of buttons != number of nodes.
- return ((beforeNode->GetParent()->GetIndexOf(beforeNode) + 1) -
+ return ((beforeNode->parent()->GetIndexOf(beforeNode) + 1) -
[[parentButton_ cell] startingChildIndex]);
}
@@ -1277,7 +1277,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
// http://crbug.com/35966
const BookmarkNode* node = [button bookmarkNode];
if (node) {
- const BookmarkNode* parent = node->GetParent();
+ const BookmarkNode* parent = node->parent();
[self bookmarkModel]->Remove(parent,
parent->GetIndexOf(node));
}
@@ -1477,7 +1477,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
// When adding a button to an empty folder we must remove the 'empty'
// placeholder button. This can be detected by checking for a parent
// child count of 1.
- const BookmarkNode* parentNode = node->GetParent();
+ const BookmarkNode* parentNode = node->parent();
if (parentNode->GetChildCount() == 1) {
BookmarkButton* emptyButton = [buttons_ lastObject];
newButtonFrame = [emptyButton frame];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index 85ac568..ee9686d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -174,8 +174,8 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
// Remove the bookmark with the long title.
void RemoveLongTitleNode() {
BookmarkModel* model = helper_.profile()->GetBookmarkModel();
- model->Remove(longTitleNode_->GetParent(),
- longTitleNode_->GetParent()->GetIndexOf(longTitleNode_));
+ model->Remove(longTitleNode_->parent(),
+ longTitleNode_->parent()->GetIndexOf(longTitleNode_));
}
// Add LOTS of nodes to our model if needed (e.g. scrolling).
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
index d0a6dd8..5d32a8d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
@@ -116,7 +116,7 @@ void BookmarkBubbleNotificationBridge::Observe(
// until we find something visible to pulse.
- (void)startPulsingBookmarkButton:(const BookmarkNode*)node {
while (node) {
- if ((node->GetParent() == model_->GetBookmarkBarNode()) ||
+ if ((node->parent() == model_->GetBookmarkBarNode()) ||
(node == model_->other_node())) {
pulsingBookmarkNode_ = node;
NSValue *value = [NSValue valueWithPointer:node];
@@ -132,7 +132,7 @@ void BookmarkBubbleNotificationBridge::Observe(
userInfo:dict];
return;
}
- node = node->GetParent();
+ node = node->parent();
}
}
@@ -332,7 +332,7 @@ void BookmarkBubbleNotificationBridge::Observe(
model_->profile());
}
// Then the parent folder.
- const BookmarkNode* oldParent = node_->GetParent();
+ const BookmarkNode* oldParent = node_->parent();
NSMenuItem* selectedItem = [folderPopUpButton_ selectedItem];
id representedObject = [selectedItem representedObject];
if ([representedObject isEqual:[[self class] chooseAnotherFolderObject]]) {
@@ -365,7 +365,7 @@ void BookmarkBubbleNotificationBridge::Observe(
ChooseAnotherFolder* obj = [[self class] chooseAnotherFolderObject];
[item setRepresentedObject:obj];
// Finally, select the current parent.
- NSValue* parentValue = [NSValue valueWithPointer:node_->GetParent()];
+ NSValue* parentValue = [NSValue valueWithPointer:node_->parent()];
NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
[folderPopUpButton_ selectItemAtIndex:idx];
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
index ef3a47a..709ce70 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
@@ -277,7 +277,7 @@ TEST_F(BookmarkBubbleControllerTest, TestUserEdit) {
// Make sure bookmark has changed
EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("oops"));
- EXPECT_EQ(node->GetParent()->GetTitle(), ASCIIToUTF16("grandma"));
+ EXPECT_EQ(node->parent()->GetTitle(), ASCIIToUTF16("grandma"));
}
// Confirm happiness with parent nodes that have the same name.
@@ -308,7 +308,7 @@ TEST_F(BookmarkBubbleControllerTest, TestNewParentSameName) {
// Make sure bookmark has changed, and that the parent is what we
// expect. This proves nobody did searching based on name.
- EXPECT_EQ(node->GetParent(), bookmarkBarNode->GetChild(i));
+ EXPECT_EQ(node->parent(), bookmarkBarNode->GetChild(i));
}
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
index 191f371..e9f0575 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
@@ -180,7 +180,7 @@ BookmarkButton* gDraggedButton = nil; // Weak
delay:NO];
}
const BookmarkNode* node = [self bookmarkNode];
- const BookmarkNode* parent = node ? node->GetParent() : NULL;
+ const BookmarkNode* parent = node ? node->parent() : NULL;
if (parent && parent->type() == BookmarkNode::FOLDER) {
UserMetrics::RecordAction(UserMetricsAction("BookmarkBarFolder_DragStart"));
} else {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
index 129117d..294c0f9 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
@@ -145,7 +145,7 @@
const BookmarkNode* node =
static_cast<const BookmarkNode*>([[self representedObject] pointerValue]);
- if (node->GetParent() && node->GetParent()->type() == BookmarkNode::FOLDER) {
+ if (node->parent() && node->parent()->type() == BookmarkNode::FOLDER) {
UserMetrics::RecordAction(UserMetricsAction("BookmarkBarFolder_CtxMenu"));
} else {
UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_CtxMenu"));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index 329a027..8d4f312 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -364,7 +364,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
while (node != rootNode) {
DCHECK(node);
nodeStack.push(node);
- node = node->GetParent();
+ node = node->parent();
}
NSUInteger stackSize = nodeStack.size();
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
index 2fbd889..5e27422 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
@@ -348,22 +348,22 @@ TEST_F(BookmarkEditorControllerTreeTest, VerifyBookmarkTestModel) {
}
TEST_F(BookmarkEditorControllerTreeTest, RenameBookmarkInPlace) {
- const BookmarkNode* oldParent = bookmark_bb_3_->GetParent();
+ const BookmarkNode* oldParent = bookmark_bb_3_->parent();
[controller_ setDisplayName:@"NEW NAME"];
[controller_ ok:nil];
UpdateBB3();
- const BookmarkNode* newParent = bookmark_bb_3_->GetParent();
+ const BookmarkNode* newParent = bookmark_bb_3_->parent();
ASSERT_EQ(newParent, oldParent);
int childIndex = newParent->GetIndexOf(bookmark_bb_3_);
ASSERT_EQ(3, childIndex);
}
TEST_F(BookmarkEditorControllerTreeTest, ChangeBookmarkURLInPlace) {
- const BookmarkNode* oldParent = bookmark_bb_3_->GetParent();
+ const BookmarkNode* oldParent = bookmark_bb_3_->parent();
[controller_ setDisplayURL:@"https://bb-3.com"];
[controller_ ok:nil];
UpdateBB3();
- const BookmarkNode* newParent = bookmark_bb_3_->GetParent();
+ const BookmarkNode* newParent = bookmark_bb_3_->parent();
ASSERT_EQ(newParent, oldParent);
int childIndex = newParent->GetIndexOf(bookmark_bb_3_);
ASSERT_EQ(3, childIndex);
@@ -373,7 +373,7 @@ TEST_F(BookmarkEditorControllerTreeTest, ChangeBookmarkGroup) {
[controller_ selectTestNodeInBrowser:group_c_];
[controller_ ok:nil];
UpdateBB3();
- const BookmarkNode* parent = bookmark_bb_3_->GetParent();
+ const BookmarkNode* parent = bookmark_bb_3_->parent();
ASSERT_EQ(parent, group_c_);
int childIndex = parent->GetIndexOf(bookmark_bb_3_);
ASSERT_EQ(4, childIndex);
@@ -384,7 +384,7 @@ TEST_F(BookmarkEditorControllerTreeTest, ChangeNameAndBookmarkGroup) {
[controller_ selectTestNodeInBrowser:group_c_];
[controller_ ok:nil];
UpdateBB3();
- const BookmarkNode* parent = bookmark_bb_3_->GetParent();
+ const BookmarkNode* parent = bookmark_bb_3_->parent();
ASSERT_EQ(parent, group_c_);
int childIndex = parent->GetIndexOf(bookmark_bb_3_);
ASSERT_EQ(4, childIndex);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
index 5ff8687..b01769b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
@@ -61,7 +61,7 @@ TEST_F(BookmarkModelObserverForCocoaTest, TestCallback) {
model->Move(node, model->other_node(), 0);
EXPECT_EQ(3, pingCount.get()->pings);
- model->Remove(node->GetParent(), 0);
+ model->Remove(node->parent(), 0);
EXPECT_EQ(4, pingCount.get()->pings);
}
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index ce8f3fe..115e31f 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1570,7 +1570,7 @@
[[[BookmarkEditorController alloc]
initWithParentWindow:[self window]
profile:browser_->profile()
- parent:node->GetParent()
+ parent:node->parent()
node:node
configuration:BookmarkEditor::SHOW_TREE]
runAsModalSheet];
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
index add4f7b..7995585 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
@@ -118,7 +118,7 @@ class StatusBubbleMacTest : public CocoaTest {
NSWindow* GetWindow() {
return bubble_->window_;
}
- NSWindow* GetParent() {
+ NSWindow* parent() {
return bubble_->parent_;
}
StatusBubbleMac::StatusBubbleState GetState() {
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index 1e788f7..1782085 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -477,7 +477,7 @@ void BookmarkBarGtk::BookmarkNodeRemoved(BookmarkModel* model,
void BookmarkBarGtk::BookmarkNodeChanged(BookmarkModel* model,
const BookmarkNode* node) {
- if (node->GetParent() != model_->GetBookmarkBarNode()) {
+ if (node->parent() != model_->GetBookmarkBarNode()) {
// We only care about nodes on the bookmark bar.
return;
}
@@ -722,8 +722,8 @@ bool BookmarkBarGtk::GetTabContentsSize(gfx::Size* size) {
void BookmarkBarGtk::StartThrobbing(const BookmarkNode* node) {
const BookmarkNode* parent_on_bb = NULL;
for (const BookmarkNode* parent = node; parent;
- parent = parent->GetParent()) {
- if (parent->GetParent() == model_->GetBookmarkBarNode()) {
+ parent = parent->parent()) {
+ if (parent->parent() == model_->GetBookmarkBarNode()) {
parent_on_bb = parent;
break;
}
@@ -976,7 +976,7 @@ void BookmarkBarGtk::PopupMenuForNode(GtkWidget* sender,
parent = model_->GetBookmarkBarNode();
} else if (sender != bookmark_toolbar_.get()) {
nodes.push_back(node);
- parent = node->GetParent();
+ parent = node->parent();
} else {
parent = model_->GetBookmarkBarNode();
nodes.push_back(parent);
@@ -1392,7 +1392,7 @@ void BookmarkBarGtk::PopupForButton(GtkWidget* button) {
} else {
// Overflow exists: don't show anything for an overflowed folder button.
if (button != overflow_button_ && button != other_bookmarks_button_ &&
- node->GetParent()->GetIndexOf(node) >= first_hidden) {
+ node->parent()->GetIndexOf(node) >= first_hidden) {
return;
}
}
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
index 5538ca7..351997a 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
@@ -205,7 +205,7 @@ BookmarkBubbleGtk::~BookmarkBubbleGtk() {
BookmarkModel* model = profile_->GetBookmarkModel();
const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
if (node)
- model->Remove(node->GetParent(), node->GetParent()->GetIndexOf(node));
+ model->Remove(node->parent(), node->parent()->GetIndexOf(node));
}
}
@@ -287,7 +287,7 @@ void BookmarkBubbleGtk::ApplyEdits() {
// Last index means 'Choose another folder...'
if (index < folder_combo_model_->GetItemCount() - 1) {
const BookmarkNode* new_parent = folder_combo_model_->GetNodeAt(index);
- if (new_parent != node->GetParent()) {
+ if (new_parent != node->parent()) {
UserMetrics::RecordAction(
UserMetricsAction("BookmarkBubble_ChangeParent"), profile_);
model->Move(node, new_parent, new_parent->GetChildCount());
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
index 466a078..4759a83 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
@@ -67,7 +67,7 @@ class BookmarkEditorGtk::ContextMenuController
void RunMenu(const gfx::Point& point, guint32 event_time) {
const BookmarkNode* selected_node = GetSelectedNode();
if (selected_node)
- running_menu_for_root_ = selected_node->GetParent()->IsRoot();
+ running_menu_for_root_ = selected_node->parent()->IsRoot();
#if defined(TOOLKIT_VIEWS)
menu_->RunContextMenuAt(point);
#else
@@ -317,7 +317,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
GtkTreeIter selected_iter;
int64 selected_id = 0;
if (details_.type == EditDetails::EXISTING_NODE)
- selected_id = details_.existing_node->GetParent()->id();
+ selected_id = details_.existing_node->parent()->id();
else if (parent_)
selected_id = parent_->id();
tree_store_ = bookmark_utils::MakeFolderTreeStore();
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
index 19c9692..837fbb2 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
@@ -255,7 +255,7 @@ gboolean BookmarkMenuController::OnMenuButtonPressedOrReleased(
} else if (event->button == 3) {
DCHECK_NE(is_empty_menu, !!node);
if (!is_empty_menu)
- parent = node->GetParent();
+ parent = node->parent();
// Show the right click menu and stop processing this button event.
std::vector<const BookmarkNode*> nodes;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index ce4811a..2b2162e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1037,7 +1037,7 @@ void BookmarkBarView::BookmarkNodeChanged(BookmarkModel* model,
void BookmarkBarView::BookmarkNodeChangedImpl(BookmarkModel* model,
const BookmarkNode* node) {
- if (node->GetParent() != model_->GetBookmarkBarNode()) {
+ if (node->parent() != model_->GetBookmarkBarNode()) {
// We only care about nodes on the bookmark bar.
return;
}
@@ -1234,7 +1234,7 @@ void BookmarkBarView::ShowContextMenuForView(View* source,
const BookmarkNode* node =
model_->GetBookmarkBarNode()->GetChild(bookmark_button_index);
nodes.push_back(node);
- parent = node->GetParent();
+ parent = node->parent();
} else {
parent = model_->GetBookmarkBarNode();
nodes.push_back(parent);
@@ -1507,7 +1507,7 @@ void BookmarkBarView::StartThrobbing(const BookmarkNode* node,
const BookmarkNode* bbn = model_->GetBookmarkBarNode();
const BookmarkNode* parent_on_bb = node;
while (parent_on_bb) {
- const BookmarkNode* parent = parent_on_bb->GetParent();
+ const BookmarkNode* parent = parent_on_bb->parent();
if (parent == bbn)
break;
parent_on_bb = parent;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 1fcc455..a4881ea 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -128,7 +128,7 @@ BookmarkBubbleView::~BookmarkBubbleView() {
BookmarkModel* model = profile_->GetBookmarkModel();
const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
if (node)
- model->Remove(node->GetParent(), node->GetParent()->GetIndexOf(node));
+ model->Remove(node->parent(), node->parent()->GetIndexOf(node));
}
}
@@ -416,7 +416,7 @@ void BookmarkBubbleView::ApplyEdits() {
parent_model_.GetItemCount() - 1) {
const BookmarkNode* new_parent =
parent_model_.GetNodeAt(parent_combobox_->selected_item());
- if (new_parent != node->GetParent()) {
+ if (new_parent != node->parent()) {
UserMetrics::RecordAction(
UserMetricsAction("BookmarkBubble_ChangeParent"), profile_);
model->Move(node, new_parent, new_parent->GetChildCount());
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
index 40e5c4b..4e03bb0 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
@@ -146,8 +146,8 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
delegate_->WillRemoveBookmarks(selection_);
for (size_t i = 0; i < selection_.size(); ++i) {
- model->Remove(selection_[i]->GetParent(),
- selection_[i]->GetParent()->GetIndexOf(selection_[i]));
+ model->Remove(selection_[i]->parent(),
+ selection_[i]->parent()->GetIndexOf(selection_[i]));
}
delegate_->DidRemoveBookmarks();
selection_.clear();
@@ -228,7 +228,7 @@ bool BookmarkContextMenuControllerViews::IsItemChecked(int id) const {
bool BookmarkContextMenuControllerViews::IsCommandEnabled(int id) const {
bool is_root_node =
(selection_.size() == 1 &&
- selection_[0]->GetParent() == model_->root_node());
+ selection_[0]->parent() == model_->root_node());
switch (id) {
case IDC_BOOKMARK_BAR_OPEN_INCOGNITO:
return !profile_->IsOffTheRecord() &&
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
index cf5ceba..28e997e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
@@ -113,7 +113,7 @@ TEST_F(BookmarkContextMenuTest, DeleteURL) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetURL();
ASSERT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
// Delete the URL.
@@ -158,7 +158,7 @@ TEST_F(BookmarkContextMenuTest, SingleURL) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -177,7 +177,7 @@ TEST_F(BookmarkContextMenuTest, MultipleURLs) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(1)->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -195,7 +195,7 @@ TEST_F(BookmarkContextMenuTest, SingleFolder) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -215,7 +215,7 @@ TEST_F(BookmarkContextMenuTest, MultipleEmptyFolders) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_FALSE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -235,7 +235,7 @@ TEST_F(BookmarkContextMenuTest, MultipleFoldersWithURLs) {
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(4));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
EXPECT_TRUE(
controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
@@ -252,7 +252,7 @@ TEST_F(BookmarkContextMenuTest, DisableIncognito) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
BookmarkContextMenu controller(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
profile_->set_off_the_record(true);
EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_INCOGNITO));
EXPECT_FALSE(
@@ -290,7 +290,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
std::vector<const BookmarkNode*> nodes;
nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
scoped_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
EXPECT_TRUE(controller->IsCommandEnabled(IDC_COPY));
EXPECT_TRUE(controller->IsCommandEnabled(IDC_CUT));
@@ -298,7 +298,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
controller->ExecuteCommand(IDC_COPY);
controller.reset(new BookmarkContextMenu(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
int old_count = model_->GetBookmarkBarNode()->GetChildCount();
controller->ExecuteCommand(IDC_PASTE);
@@ -308,7 +308,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
model_->GetBookmarkBarNode()->GetChild(1)->GetURL());
controller.reset(new BookmarkContextMenu(
- NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
+ NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
// Cut the URL.
controller->ExecuteCommand(IDC_CUT);
ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index b1d3885..54f1ed5 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -177,7 +177,7 @@ bool BookmarkEditorView::CanEdit(views::TreeView* tree_view,
ui::TreeModelNode* node) {
// Only allow editting of children of the bookmark bar node and other node.
EditorNode* bb_node = tree_model_->AsNode(node);
- return (bb_node->GetParent() && bb_node->GetParent()->GetParent());
+ return (bb_node->parent() && bb_node->parent()->parent());
}
void BookmarkEditorView::ContentsChanged(Textfield* sender,
@@ -470,7 +470,7 @@ void BookmarkEditorView::ExpandAndSelect() {
const BookmarkNode* to_select = parent_;
if (details_.type == EditDetails::EXISTING_NODE)
- to_select = details_.existing_node->GetParent();
+ to_select = details_.existing_node->parent();
int64 group_id_to_select = to_select->id();
EditorNode* b_node =
FindNodeWithID(tree_model_->GetRoot(), group_id_to_select);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
index b4f8dbf..9eb382b 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
@@ -150,7 +150,7 @@ bool BookmarkMenuController::CanDrop(MenuItemView* menu,
const BookmarkNode* drop_node = menu_id_to_node_map_[menu->GetCommand()];
DCHECK(drop_node);
while (drop_node && drop_node != drag_node)
- drop_node = drop_node->GetParent();
+ drop_node = drop_node->parent();
return (drop_node == NULL);
}
@@ -162,7 +162,7 @@ int BookmarkMenuController::GetDropOperation(
DCHECK(drop_data_.is_valid());
const BookmarkNode* node = menu_id_to_node_map_[item->GetCommand()];
- const BookmarkNode* drop_parent = node->GetParent();
+ const BookmarkNode* drop_parent = node->parent();
int index_to_drop_at = drop_parent->GetIndexOf(node);
if (*position == DROP_AFTER) {
index_to_drop_at++;
@@ -182,7 +182,7 @@ int BookmarkMenuController::OnPerformDrop(MenuItemView* menu,
DCHECK(drop_node);
BookmarkModel* model = profile_->GetBookmarkModel();
DCHECK(model);
- const BookmarkNode* drop_parent = drop_node->GetParent();
+ const BookmarkNode* drop_parent = drop_node->parent();
DCHECK(drop_parent);
int index_to_drop_at = drop_parent->GetIndexOf(drop_node);
if (position == DROP_AFTER) {
@@ -212,7 +212,7 @@ bool BookmarkMenuController::ShowContextMenu(MenuItemView* source,
parent_,
profile_,
page_navigator_,
- nodes[0]->GetParent(),
+ nodes[0]->parent(),
nodes));
context_menu_->set_observer(this);
context_menu_->RunMenuAt(p);
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 70adeea..dc3f9a4 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -98,7 +98,7 @@ void BrowserActionButton::ViewHierarchyChanged(
// LoadImage is not guaranteed to be synchronous, so we might see the
// callback OnImageLoaded execute immediately. It (through UpdateState)
- // expects GetParent() to return the owner for this button, so this
+ // expects parent() to return the owner for this button, so this
// function is as early as we can start this request.
tracker_.LoadImage(extension_, extension_->GetResource(relative_path),
gfx::Size(Extension::kBrowserActionIconMaxSize,
diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index e65319f..c53009f 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -85,11 +85,11 @@ bool BookmarkModelVerifier::NodesMatch(const BookmarkNode* node_a,
<< node_b->GetURL();
return false;
}
- if (node_a->GetParent()->GetIndexOf(node_a) !=
- node_b->GetParent()->GetIndexOf(node_b)) {
+ if (node_a->parent()->GetIndexOf(node_a) !=
+ node_b->parent()->GetIndexOf(node_b)) {
LOG(ERROR) << "Index mismatch: "
- << node_a->GetParent()->GetIndexOf(node_a) << " vs. "
- << node_b->GetParent()->GetIndexOf(node_b);
+ << node_a->parent()->GetIndexOf(node_a) << " vs. "
+ << node_b->parent()->GetIndexOf(node_b);
return false;
}
return true;
@@ -153,7 +153,7 @@ bool BookmarkModelVerifier::ContainsDuplicateBookmarks(BookmarkModel* model) {
for (std::vector<const BookmarkNode*>::const_iterator it = nodes.begin();
it != nodes.end(); ++it) {
if (node->id() != (*it)->id() &&
- node->GetParent() == (*it)->GetParent() &&
+ node->parent() == (*it)->parent() &&
node->GetTitle() == (*it)->GetTitle()){
return true;
}
@@ -186,8 +186,8 @@ void BookmarkModelVerifier::FindNodeInVerifier(BookmarkModel* foreign_model,
std::stack<int> path;
const BookmarkNode* walker = foreign_node;
while (walker != foreign_model->root_node()) {
- path.push(walker->GetParent()->GetIndexOf(walker));
- walker = walker->GetParent();
+ path.push(walker->parent()->GetIndexOf(walker));
+ walker = walker->parent();
}
// Swing over to the other tree.
@@ -329,10 +329,10 @@ const BookmarkNode* BookmarkModelVerifier::SetURL(BookmarkModel* model,
const BookmarkNode* v_node = NULL;
FindNodeInVerifier(model, node, &v_node);
bookmark_utils::ApplyEditsWithNoGroupChange(
- verifier_model_, v_node->GetParent(),
+ verifier_model_, v_node->parent(),
BookmarkEditor::EditDetails(v_node), v_node->GetTitle(), new_url);
}
return bookmark_utils::ApplyEditsWithNoGroupChange(
- model, node->GetParent(), BookmarkEditor::EditDetails(node),
+ model, node->parent(), BookmarkEditor::EditDetails(node),
node->GetTitle(), new_url);
}
diff --git a/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc
index 759ff43..6e04ffe 100644
--- a/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc
@@ -84,15 +84,15 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveBookmarksSyncTest, Sanity) {
const BookmarkNode* porsche = AddURL(0, bar, 2, L"Porsche",
GURL("http://www.porsche.com"));
// Rearrange stuff in tier1_a.
- ASSERT_EQ(tier1_a, tier1_a_url2->GetParent());
- ASSERT_EQ(tier1_a, tier1_a_url1->GetParent());
+ ASSERT_EQ(tier1_a, tier1_a_url2->parent());
+ ASSERT_EQ(tier1_a, tier1_a_url1->parent());
Move(0, tier1_a_url2, tier1_a, 0);
Move(0, tier1_a_url1, tier1_a, 2);
ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
"Rearrange stuff in tier1_a"));
ASSERT_TRUE(ModelMatchesVerifier(0));
- ASSERT_EQ(1, tier1_a_url0->GetParent()->GetIndexOf(tier1_a_url0));
+ ASSERT_EQ(1, tier1_a_url0->parent()->GetIndexOf(tier1_a_url0));
Move(0, tier1_a_url0, bar, bar->GetChildCount());
const BookmarkNode* boa = AddURL(0, bar, bar->GetChildCount(),
L"Bank of America", GURL("https://www.bankofamerica.com"));
diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h
index 34f6ee8..482221d 100644
--- a/ui/base/models/tree_node_model.h
+++ b/ui/base/models/tree_node_model.h
@@ -84,7 +84,7 @@ class TreeNode : public TreeModelNode {
DCHECK_LE(0, index);
DCHECK_GE(GetChildCount(), index);
// If the node has a parent, remove it from its parent.
- NodeType* node_parent = child->GetParent();
+ NodeType* node_parent = child->parent();
if (node_parent)
node_parent->Remove(node_parent->GetIndexOf(child));
child->parent_ = static_cast<NodeType*>(this);
@@ -135,13 +135,9 @@ class TreeNode : public TreeModelNode {
return children_[index];
}
- // Returns the parent.
- NodeType* GetParent() {
- return parent_;
- }
- const NodeType* GetParent() const {
- return parent_;
- }
+ // Returns the parent of this object, or NULL if it's the root.
+ const NodeType* parent() const { return parent_; }
+ NodeType* parent() { return parent_; }
// Returns the index of |node|, or -1 if |node| is not a child of this.
int GetIndexOf(const NodeType* node) const {
@@ -256,7 +252,7 @@ class TreeNodeModel : public TreeModel {
virtual TreeModelNode* GetParent(TreeModelNode* node) {
DCHECK(node);
- return AsNode(node)->GetParent();
+ return AsNode(node)->parent();
}
NodeType* AsNode(TreeModelNode* model_node) {