| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/glue/extensions_activity_monitor.h" | 5 #include "chrome/browser/sync/glue/extensions_activity_monitor.h" |
| 6 | 6 |
| 7 #include "components/sync/base/extensions_activity.h" |
| 7 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 8 #include "sync/util/extensions_activity.h" | |
| 9 | 9 |
| 10 #if defined(ENABLE_EXTENSIONS) | 10 #if defined(ENABLE_EXTENSIONS) |
| 11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
| 12 #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" | 12 #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" |
| 13 #include "content/public/browser/notification_service.h" | 13 #include "content/public/browser/notification_service.h" |
| 14 #include "extensions/common/extension.h" | 14 #include "extensions/common/extension.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 using content::BrowserThread; | 17 using content::BrowserThread; |
| 18 | 18 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } | 61 } |
| 62 #endif | 62 #endif |
| 63 } | 63 } |
| 64 | 64 |
| 65 const scoped_refptr<syncer::ExtensionsActivity>& | 65 const scoped_refptr<syncer::ExtensionsActivity>& |
| 66 ExtensionsActivityMonitor::GetExtensionsActivity() { | 66 ExtensionsActivityMonitor::GetExtensionsActivity() { |
| 67 return extensions_activity_; | 67 return extensions_activity_; |
| 68 } | 68 } |
| 69 | 69 |
| 70 } // namespace browser_sync | 70 } // namespace browser_sync |
| OLD | NEW |