summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorrfevang@chromium.org <rfevang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 06:34:58 +0000
committerrfevang@chromium.org <rfevang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 06:34:58 +0000
commit66e8fe6e3b21d65778b3d600fdda5e07b2b66727 (patch)
tree49f675ec87805b69ddf8bfdc9e78994af3d3d781 /chrome/browser/extensions
parent04140a810d17fb3baef923f73c72bccc9d8f5fb6 (diff)
downloadchromium_src-66e8fe6e3b21d65778b3d600fdda5e07b2b66727.zip
chromium_src-66e8fe6e3b21d65778b3d600fdda5e07b2b66727.tar.gz
chromium_src-66e8fe6e3b21d65778b3d600fdda5e07b2b66727.tar.bz2
Don't set the URL field of folders for bookmarks.onChanged.
Fixes an issue where renaming a folder in the bookmark manager would turn a folder into a file. BUG=358613 Review URL: https://codereview.chromium.org/220473011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/api/bookmarks/bookmarks_api.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index 9c55b1c..9fd2857 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -248,7 +248,8 @@ void BookmarkEventRouter::BookmarkNodeChanged(BookmarkModel* model,
// BookmarkModel to indicate what changed.
bookmarks::OnChanged::ChangeInfo change_info;
change_info.title = base::UTF16ToUTF8(node->GetTitle());
- change_info.url.reset(new std::string(node->url().spec()));
+ if (node->is_url())
+ change_info.url.reset(new std::string(node->url().spec()));
DispatchEvent(bookmarks::OnChanged::kEventName,
bookmarks::OnChanged::Create(base::Int64ToString(node->id()),