| 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/sessions_helper.h" | 5 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 } | 140 } |
| 141 | 141 |
| 142 void OnLocalTabModified( | 142 void OnLocalTabModified( |
| 143 browser_sync::SyncedTabDelegate* modified_tab) override { | 143 browser_sync::SyncedTabDelegate* modified_tab) override { |
| 144 // Unwind to ensure SessionsSyncManager has processed the event. | 144 // Unwind to ensure SessionsSyncManager has processed the event. |
| 145 base::ThreadTaskRunnerHandle::Get()->PostTask( | 145 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 146 FROM_HERE, | 146 FROM_HERE, |
| 147 base::Bind(&TabEventHandler::QuitLoop, weak_factory_.GetWeakPtr())); | 147 base::Bind(&TabEventHandler::QuitLoop, weak_factory_.GetWeakPtr())); |
| 148 } | 148 } |
| 149 | 149 |
| 150 void OnFaviconPageUrlsUpdated( | 150 void OnFaviconsChanged(const std::vector<GURL>& /* page_urls */, |
| 151 const std::set<GURL>& updated_page_urls) override { | 151 const std::vector<GURL>& /* icon_urls */) override { |
| 152 // Unwind to ensure SessionsSyncManager has processed the event. | 152 // Unwind to ensure SessionsSyncManager has processed the event. |
| 153 base::ThreadTaskRunnerHandle::Get()->PostTask( | 153 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 154 FROM_HERE, | 154 FROM_HERE, |
| 155 base::Bind(&TabEventHandler::QuitLoop, weak_factory_.GetWeakPtr())); | 155 base::Bind(&TabEventHandler::QuitLoop, weak_factory_.GetWeakPtr())); |
| 156 } | 156 } |
| 157 | 157 |
| 158 private: | 158 private: |
| 159 void QuitLoop() { | 159 void QuitLoop() { |
| 160 base::MessageLoop::current()->Quit(); | 160 base::MessageLoop::current()->Quit(); |
| 161 } | 161 } |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 return !checker.TimedOut(); | 406 return !checker.TimedOut(); |
| 407 } | 407 } |
| 408 | 408 |
| 409 void DeleteForeignSession(int index, std::string session_tag) { | 409 void DeleteForeignSession(int index, std::string session_tag) { |
| 410 ProfileSyncServiceFactory::GetInstance()->GetForProfile( | 410 ProfileSyncServiceFactory::GetInstance()->GetForProfile( |
| 411 test()->GetProfile(index))-> | 411 test()->GetProfile(index))-> |
| 412 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag); | 412 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag); |
| 413 } | 413 } |
| 414 | 414 |
| 415 } // namespace sessions_helper | 415 } // namespace sessions_helper |
| OLD | NEW |