diff options
| author | ian@chromium.org <ian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:44:48 +0000 |
|---|---|---|
| committer | ian@chromium.org <ian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:44:48 +0000 |
| commit | 0457c6bb559c2cebf47235388f0441be51817d60 (patch) | |
| tree | c0cabb4c18a45d1f5d48df8bb19e6442ad95b357 /chrome/browser/bookmarks | |
| parent | e06131db8c610bca50a025fc876755d0aa42e53c (diff) | |
| download | chromium_src-0457c6bb559c2cebf47235388f0441be51817d60.zip chromium_src-0457c6bb559c2cebf47235388f0441be51817d60.tar.gz chromium_src-0457c6bb559c2cebf47235388f0441be51817d60.tar.bz2 | |
Fixes a bug where if there are only localstorage nodes, but nocookies nodes, the Remove and Remove All buttons are disabled.BUG=34886
TEST=clear all cookies, go to www.ianfette.com/localstorage.html and open cookies dialog, check that remove button is enabled.
Review URL: http://codereview.chromium.org/596002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_folder_tree_model.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc index 2591fd0..e8b3827 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc @@ -128,8 +128,9 @@ void BookmarkFolderTreeModel::BookmarkNodeChanged(BookmarkModel* model, return; folder_node->SetTitle(node->GetTitle()); - if (GetObserver()) - GetObserver()->TreeNodeChanged(this, folder_node); + FOR_EACH_OBSERVER(TreeModelObserver, + observer_list(), + TreeNodeChanged(this, folder_node)); } void BookmarkFolderTreeModel::BookmarkNodeChildrenReordered( @@ -162,8 +163,9 @@ void BookmarkFolderTreeModel::BookmarkNodeChildrenReordered( DCHECK(original_count == folder_node->GetChildCount()); // Finally, notify observers. - if (GetObserver()) - GetObserver()->TreeNodeChildrenReordered(this, folder_node); + FOR_EACH_OBSERVER(TreeModelObserver, + observer_list(), + TreeNodeChildrenReordered(this, folder_node)); } void BookmarkFolderTreeModel::GetIcons(std::vector<SkBitmap>* icons) { diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc index 2f9b3b5..c1c9a68 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc @@ -54,7 +54,7 @@ class BookmarkFolderTreeModelTest : public testing::Test, bookmark_model()->AddURL(other, 2, L"url3", url3_); model_.reset(new BookmarkFolderTreeModel(bookmark_model())); - model_->SetObserver(this); + model_->AddObserver(this); } virtual void TearDown() { |