| 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/ui/webui/session_favicon_source.h" | 5 #include "chrome/browser/ui/webui/session_favicon_source.h" |
| 6 | 6 |
| 7 #include "chrome/browser/sync/glue/session_model_associator.h" | 7 #include "chrome/browser/sync/glue/session_model_associator.h" |
| 8 #include "chrome/browser/sync/profile_sync_service_factory.h" | 8 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 9 #include "chrome/browser/sync/profile_sync_service.h" | 9 #include "chrome/browser/sync/profile_sync_service.h" |
| 10 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" | 10 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 SessionModelAssociator* associator = sync_service ? | 45 SessionModelAssociator* associator = sync_service ? |
| 46 sync_service->GetSessionModelAssociator() : NULL; | 46 sync_service->GetSessionModelAssociator() : NULL; |
| 47 | 47 |
| 48 std::string favicon_data; | 48 std::string favicon_data; |
| 49 if (associator && | 49 if (associator && |
| 50 associator->GetSyncedFaviconForPageURL(request.request_path, | 50 associator->GetSyncedFaviconForPageURL(request.request_path, |
| 51 &favicon_data)) { | 51 &favicon_data)) { |
| 52 scoped_refptr<base::RefCountedString> response = | 52 scoped_refptr<base::RefCountedString> response = |
| 53 new base::RefCountedString(); | 53 new base::RefCountedString(); |
| 54 response->data() = favicon_data; | 54 response->data() = favicon_data; |
| 55 url_data_source()->SendResponse(request.request_id, response); | 55 request.callback.Run(response); |
| 56 return true; | 56 return true; |
| 57 } | 57 } |
| 58 return false; | 58 return false; |
| 59 } | 59 } |
| OLD | NEW |