OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/sessions/page_revisit_broadcaster.h" | 5 #include "chrome/browser/sync/sessions/page_revisit_broadcaster.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
11 #include "chrome/browser/history/history_service_factory.h" | 11 #include "chrome/browser/history/history_service_factory.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/sync/glue/synced_session_util.h" | |
14 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" | 13 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
15 #include "components/history/core/browser/history_service.h" | 14 #include "components/history/core/browser/history_service.h" |
16 #include "components/sync_sessions/revisit/sessions_page_revisit_observer.h" | 15 #include "components/sync_sessions/revisit/sessions_page_revisit_observer.h" |
17 #include "components/sync_sessions/revisit/typed_url_page_revisit_observer.h" | 16 #include "components/sync_sessions/revisit/typed_url_page_revisit_observer.h" |
| 17 #include "components/sync_sessions/sync_sessions_client.h" |
18 | 18 |
19 namespace browser_sync { | 19 namespace browser_sync { |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 // Simple implementation of ForeignSessionsProvider that delegates to | 23 // Simple implementation of ForeignSessionsProvider that delegates to |
24 // SessionsSyncManager. It holds onto a non-owning pointer, with the assumption | 24 // SessionsSyncManager. It holds onto a non-owning pointer, with the assumption |
25 // that this class is only used by classes owned by SessionsSyncManager itself. | 25 // that this class is only used by classes owned by SessionsSyncManager itself. |
26 class SessionsSyncManagerWrapper | 26 class SessionsSyncManagerWrapper |
27 : public sync_sessions::ForeignSessionsProvider { | 27 : public sync_sessions::ForeignSessionsProvider { |
28 public: | 28 public: |
29 explicit SessionsSyncManagerWrapper(SessionsSyncManager* manager) | 29 explicit SessionsSyncManagerWrapper(SessionsSyncManager* manager) |
30 : manager_(manager) {} | 30 : manager_(manager) {} |
31 ~SessionsSyncManagerWrapper() override{}; | 31 ~SessionsSyncManagerWrapper() override{}; |
32 bool GetAllForeignSessions( | 32 bool GetAllForeignSessions( |
33 std::vector<const sync_driver::SyncedSession*>* sessions) override { | 33 std::vector<const sync_driver::SyncedSession*>* sessions) override { |
34 return manager_->GetAllForeignSessions(sessions); | 34 return manager_->GetAllForeignSessions(sessions); |
35 } | 35 } |
36 | 36 |
37 private: | 37 private: |
38 SessionsSyncManager* manager_; | 38 SessionsSyncManager* manager_; |
39 DISALLOW_COPY_AND_ASSIGN(SessionsSyncManagerWrapper); | 39 DISALLOW_COPY_AND_ASSIGN(SessionsSyncManagerWrapper); |
40 }; | 40 }; |
41 | 41 |
42 } // namespace | 42 } // namespace |
43 | 43 |
44 PageRevisitBroadcaster::PageRevisitBroadcaster(SessionsSyncManager* manager, | 44 PageRevisitBroadcaster::PageRevisitBroadcaster( |
45 Profile* profile) { | 45 SessionsSyncManager* manager, |
| 46 sync_sessions::SyncSessionsClient* sessions_client, |
| 47 Profile* profile) |
| 48 : sessions_client_(sessions_client) { |
46 const std::string group_name = | 49 const std::string group_name = |
47 base::FieldTrialList::FindFullName("PageRevisitInstrumentation"); | 50 base::FieldTrialList::FindFullName("PageRevisitInstrumentation"); |
48 bool shouldInstrument = group_name == "Enabled"; | 51 bool shouldInstrument = group_name == "Enabled"; |
49 if (shouldInstrument) { | 52 if (shouldInstrument) { |
50 revisit_observers_.push_back(new sync_sessions::SessionsPageRevisitObserver( | 53 revisit_observers_.push_back(new sync_sessions::SessionsPageRevisitObserver( |
51 scoped_ptr<sync_sessions::ForeignSessionsProvider>( | 54 scoped_ptr<sync_sessions::ForeignSessionsProvider>( |
52 new SessionsSyncManagerWrapper(manager)))); | 55 new SessionsSyncManagerWrapper(manager)))); |
53 | 56 |
54 history::HistoryService* history = | 57 history::HistoryService* history = |
55 HistoryServiceFactory::GetForProfileWithoutCreating(profile); | 58 HistoryServiceFactory::GetForProfileWithoutCreating(profile); |
56 if (history) { | 59 if (history) { |
57 revisit_observers_.push_back( | 60 revisit_observers_.push_back( |
58 new sync_sessions::TypedUrlPageRevisitObserver(history)); | 61 new sync_sessions::TypedUrlPageRevisitObserver(history)); |
59 } | 62 } |
60 // TODO(skym): Add bookmarks observer. | 63 // TODO(skym): Add bookmarks observer. |
61 } | 64 } |
62 } | 65 } |
63 | 66 |
64 PageRevisitBroadcaster::~PageRevisitBroadcaster() {} | 67 PageRevisitBroadcaster::~PageRevisitBroadcaster() {} |
65 | 68 |
66 void PageRevisitBroadcaster::OnPageVisit(const GURL& url, | 69 void PageRevisitBroadcaster::OnPageVisit(const GURL& url, |
67 const ui::PageTransition transition) { | 70 const ui::PageTransition transition) { |
68 if (ShouldSyncURL(url)) { | 71 if (sessions_client_->ShouldSyncURL(url)) { |
69 sync_sessions::PageVisitObserver::TransitionType converted( | 72 sync_sessions::PageVisitObserver::TransitionType converted( |
70 ConvertTransitionEnum(transition)); | 73 ConvertTransitionEnum(transition)); |
71 for (auto* observer : revisit_observers_) { | 74 for (auto* observer : revisit_observers_) { |
72 observer->OnPageVisit(url, converted); | 75 observer->OnPageVisit(url, converted); |
73 } | 76 } |
74 } | 77 } |
75 } | 78 } |
76 | 79 |
77 // Static | 80 // Static |
78 sync_sessions::PageVisitObserver::TransitionType | 81 sync_sessions::PageVisitObserver::TransitionType |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 case ui::PAGE_TRANSITION_KEYWORD: | 120 case ui::PAGE_TRANSITION_KEYWORD: |
118 case ui::PAGE_TRANSITION_KEYWORD_GENERATED: | 121 case ui::PAGE_TRANSITION_KEYWORD_GENERATED: |
119 return sync_sessions::PageVisitObserver::kTransitionOmniboxTemplateSearch; | 122 return sync_sessions::PageVisitObserver::kTransitionOmniboxTemplateSearch; |
120 | 123 |
121 default: | 124 default: |
122 return sync_sessions::PageVisitObserver::kTransitionUnknown; | 125 return sync_sessions::PageVisitObserver::kTransitionUnknown; |
123 } | 126 } |
124 } | 127 } |
125 | 128 |
126 } // namespace browser_sync | 129 } // namespace browser_sync |
OLD | NEW |