| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/cookies_tree_model.h" | 5 #include "chrome/browser/cookies_tree_model.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <functional> | 8 #include <functional> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 base::Bind(&CookiesTreeModel::OnAppCacheModelInfoLoaded, | 648 base::Bind(&CookiesTreeModel::OnAppCacheModelInfoLoaded, |
| 649 base::Unretained(this))); | 649 base::Unretained(this))); |
| 650 } | 650 } |
| 651 | 651 |
| 652 if (indexed_db_helper_) { | 652 if (indexed_db_helper_) { |
| 653 indexed_db_helper_->StartFetching(NewCallback( | 653 indexed_db_helper_->StartFetching(NewCallback( |
| 654 this, &CookiesTreeModel::OnIndexedDBModelInfoLoaded)); | 654 this, &CookiesTreeModel::OnIndexedDBModelInfoLoaded)); |
| 655 } | 655 } |
| 656 | 656 |
| 657 if (file_system_helper_) { | 657 if (file_system_helper_) { |
| 658 file_system_helper_->StartFetching(NewCallback( | 658 file_system_helper_->StartFetching( |
| 659 this, &CookiesTreeModel::OnFileSystemModelInfoLoaded)); | 659 base::Bind(&CookiesTreeModel::OnFileSystemModelInfoLoaded, |
| 660 base::Unretained(this))); |
| 660 } | 661 } |
| 661 | 662 |
| 662 if (quota_helper_) { | 663 if (quota_helper_) { |
| 663 quota_helper_->StartFetching(NewCallback( | 664 quota_helper_->StartFetching(NewCallback( |
| 664 this, &CookiesTreeModel::OnQuotaModelInfoLoaded)); | 665 this, &CookiesTreeModel::OnQuotaModelInfoLoaded)); |
| 665 } | 666 } |
| 666 } | 667 } |
| 667 | 668 |
| 668 CookiesTreeModel::~CookiesTreeModel() { | 669 CookiesTreeModel::~CookiesTreeModel() { |
| 669 cookie_helper_->CancelNotification(); | 670 cookie_helper_->CancelNotification(); |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1071 | 1072 |
| 1072 void CookiesTreeModel::NotifyObserverEndBatch() { | 1073 void CookiesTreeModel::NotifyObserverEndBatch() { |
| 1073 // Only notify the observers if this is the outermost call to EndBatch() if | 1074 // Only notify the observers if this is the outermost call to EndBatch() if |
| 1074 // called in a nested manner. | 1075 // called in a nested manner. |
| 1075 if (--batch_update_ == 0) { | 1076 if (--batch_update_ == 0) { |
| 1076 FOR_EACH_OBSERVER(Observer, | 1077 FOR_EACH_OBSERVER(Observer, |
| 1077 cookies_observer_list_, | 1078 cookies_observer_list_, |
| 1078 TreeModelEndBatch(this)); | 1079 TreeModelEndBatch(this)); |
| 1079 } | 1080 } |
| 1080 } | 1081 } |
| OLD | NEW |