OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 5 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 const BookmarkNode* node) override { | 122 const BookmarkNode* node) override { |
123 if (model == model_ && node == node_) | 123 if (model == model_ && node == node_) |
124 model->GetFavicon(node); | 124 model->GetFavicon(node); |
125 } | 125 } |
126 void BookmarkNodeChildrenReordered(BookmarkModel* model, | 126 void BookmarkNodeChildrenReordered(BookmarkModel* model, |
127 const BookmarkNode* node) override {} | 127 const BookmarkNode* node) override {} |
128 void BookmarkNodeFaviconChanged(BookmarkModel* model, | 128 void BookmarkNodeFaviconChanged(BookmarkModel* model, |
129 const BookmarkNode* node) override { | 129 const BookmarkNode* node) override { |
130 if (model == model_ && node == node_) { | 130 if (model == model_ && node == node_) { |
131 if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded())) | 131 if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded())) |
132 base::MessageLoopForUI::current()->Quit(); | 132 base::MessageLoopForUI::current()->QuitWhenIdle(); |
133 } | 133 } |
134 } | 134 } |
135 | 135 |
136 private: | 136 private: |
137 BookmarkModel* model_; | 137 BookmarkModel* model_; |
138 const BookmarkNode* node_; | 138 const BookmarkNode* node_; |
139 bool wait_for_load_; | 139 bool wait_for_load_; |
140 DISALLOW_COPY_AND_ASSIGN(FaviconChangeObserver); | 140 DISALLOW_COPY_AND_ASSIGN(FaviconChangeObserver); |
141 }; | 141 }; |
142 | 142 |
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
998 | 998 |
999 std::string IndexedSubfolderName(int i) { | 999 std::string IndexedSubfolderName(int i) { |
1000 return base::StringPrintf("Subfolder Name %d", i); | 1000 return base::StringPrintf("Subfolder Name %d", i); |
1001 } | 1001 } |
1002 | 1002 |
1003 std::string IndexedSubsubfolderName(int i) { | 1003 std::string IndexedSubsubfolderName(int i) { |
1004 return base::StringPrintf("Subsubfolder Name %d", i); | 1004 return base::StringPrintf("Subsubfolder Name %d", i); |
1005 } | 1005 } |
1006 | 1006 |
1007 } // namespace bookmarks_helper | 1007 } // namespace bookmarks_helper |
OLD | NEW |