Commit 5ab0c368 authored by Marti Wong's avatar Marti Wong Committed by Commit Bot

Add 2 egtests for the new iOS bookmarks

2 egtest2 are added:
1. testWhenCurrentFolderDeletedInBackground: test when the navigating
   folder of Bookmarks is deleted in background, empty background is
   shown with context bar buttons disabled.
2. testBookmarksURLDisabled: test chrome://bookmarks is disabled.

Bug: 782551
Change-Id: I1e0f4cc4960aca3094e673e812d040ec231d497c
Reviewed-on: https://chromium-review.googlesource.com/807410Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Marti Wong <martiw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521921}
parent bf54b51c
...@@ -962,6 +962,11 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) { ...@@ -962,6 +962,11 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
- (void)bookmarkNodeDeleted:(const BookmarkNode*)node - (void)bookmarkNodeDeleted:(const BookmarkNode*)node
fromFolder:(const BookmarkNode*)folder { fromFolder:(const BookmarkNode*)folder {
[self removeEditNode:node atIndexPath:nil]; [self removeEditNode:node atIndexPath:nil];
if (_rootNode == node &&
base::FeatureList::IsEnabled(kBookmarkNewGeneration)) {
[self setTableViewEditing:NO];
}
} }
- (void)bookmarkModelRemovedAllNodes { - (void)bookmarkModelRemovedAllNodes {
......
...@@ -697,12 +697,13 @@ using IntegerPair = std::pair<NSInteger, NSInteger>; ...@@ -697,12 +697,13 @@ using IntegerPair = std::pair<NSInteger, NSInteger>;
// Computes the bookmarks table view based on the current root node. // Computes the bookmarks table view based on the current root node.
- (void)computeBookmarkTableViewData { - (void)computeBookmarkTableViewData {
// Regenerate the list of all bookmarks.
_bookmarkItems.clear();
if (!self.bookmarkModel->loaded() || !_currentRootNode) { if (!self.bookmarkModel->loaded() || !_currentRootNode) {
return; return;
} }
// Regenerate the list of all bookmarks.
_bookmarkItems.clear();
if (_currentRootNode == self.bookmarkModel->root_node()) { if (_currentRootNode == self.bookmarkModel->root_node()) {
[self generateTableViewDataForRootNode]; [self generateTableViewDataForRootNode];
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment