diff options
| author | treib <treib@chromium.org> | 2015-02-23 07:57:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-23 15:57:44 +0000 |
| commit | 2d81cac8f27f6b05c77757e3f1959b29d9d39875 (patch) | |
| tree | ceba20fae983fbedc148f237d66a7308d5efc65d /chrome/browser/bookmarks | |
| parent | dda74d8ea9d458deeb6e02b590b186c50602d9b7 (diff) | |
| download | chromium_src-2d81cac8f27f6b05c77757e3f1959b29d9d39875.zip chromium_src-2d81cac8f27f6b05c77757e3f1959b29d9d39875.tar.gz chromium_src-2d81cac8f27f6b05c77757e3f1959b29d9d39875.tar.bz2 | |
Make ChromeBookmarkClient::CanSetPermanentNodeTitle say true for the supervised node.
The title can actually change when switching to a different translation, which would trigger a NOTREACHED in BookmarkModel::SetTitle.
BUG=459448
Review URL: https://codereview.chromium.org/946363002
Cr-Commit-Position: refs/heads/master@{#317587}
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/chrome_bookmark_client.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc index 15d835d..7b82935 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc @@ -196,11 +196,13 @@ bookmarks::LoadExtraCallback ChromeBookmarkClient::GetLoadExtraNodesCallback() { bool ChromeBookmarkClient::CanSetPermanentNodeTitle( const BookmarkNode* permanent_node) { // The |managed_node_| can have its title updated if the user signs in or - // out, since the name of the managed domain can appear in it. The - // |supervised_node_| has a fixed title which can never be updated. + // out, since the name of the managed domain can appear in it. + // Also, both |managed_node_| and |supervised_node_| can have their title + // updated on locale changes (crbug.com/459448). return (!bookmarks::IsDescendantOf(permanent_node, managed_node_) && !bookmarks::IsDescendantOf(permanent_node, supervised_node_)) || - permanent_node == managed_node_; + permanent_node == managed_node_ || + permanent_node == supervised_node_; } bool ChromeBookmarkClient::CanSyncNode(const BookmarkNode* node) { |