| 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 "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 model->GetFavicon(node); | 103 model->GetFavicon(node); |
| 104 } | 104 } |
| 105 virtual void BookmarkNodeChildrenReordered( | 105 virtual void BookmarkNodeChildrenReordered( |
| 106 BookmarkModel* model, | 106 BookmarkModel* model, |
| 107 const BookmarkNode* node) OVERRIDE {} | 107 const BookmarkNode* node) OVERRIDE {} |
| 108 virtual void BookmarkNodeFaviconChanged( | 108 virtual void BookmarkNodeFaviconChanged( |
| 109 BookmarkModel* model, | 109 BookmarkModel* model, |
| 110 const BookmarkNode* node) OVERRIDE { | 110 const BookmarkNode* node) OVERRIDE { |
| 111 if (model == model_ && node == node_) { | 111 if (model == model_ && node == node_) { |
| 112 if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded())) | 112 if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded())) |
| 113 MessageLoopForUI::current()->Quit(); | 113 base::MessageLoopForUI::current()->Quit(); |
| 114 } | 114 } |
| 115 } | 115 } |
| 116 | 116 |
| 117 private: | 117 private: |
| 118 BookmarkModel* model_; | 118 BookmarkModel* model_; |
| 119 const BookmarkNode* node_; | 119 const BookmarkNode* node_; |
| 120 bool wait_for_load_; | 120 bool wait_for_load_; |
| 121 DISALLOW_COPY_AND_ASSIGN(FaviconChangeObserver); | 121 DISALLOW_COPY_AND_ASSIGN(FaviconChangeObserver); |
| 122 }; | 122 }; |
| 123 | 123 |
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 | 764 |
| 765 std::wstring IndexedSubfolderName(int i) { | 765 std::wstring IndexedSubfolderName(int i) { |
| 766 return base::StringPrintf(L"Subfolder Name %d", i); | 766 return base::StringPrintf(L"Subfolder Name %d", i); |
| 767 } | 767 } |
| 768 | 768 |
| 769 std::wstring IndexedSubsubfolderName(int i) { | 769 std::wstring IndexedSubsubfolderName(int i) { |
| 770 return base::StringPrintf(L"Subsubfolder Name %d", i); | 770 return base::StringPrintf(L"Subsubfolder Name %d", i); |
| 771 } | 771 } |
| 772 | 772 |
| 773 } // namespace bookmarks_helper | 773 } // namespace bookmarks_helper |
| OLD | NEW |