| 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 <vector> | 8 #include <vector> |
| 8 | 9 |
| 9 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| 10 #include "chrome/browser/sync/glue/synced_session_util.h" | 11 #include "chrome/browser/sync/glue/synced_session_util.h" |
| 11 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" | 12 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
| 12 #include "components/sync_driver/revisit/sessions_page_revisit_observer.h" | 13 #include "components/sync_sessions/revisit/sessions_page_revisit_observer.h" |
| 13 | 14 |
| 14 namespace browser_sync { | 15 namespace browser_sync { |
| 15 | 16 |
| 16 namespace { | 17 namespace { |
| 17 | 18 |
| 18 // Simple implementation of ForeignSessionsProvider that delegates to | 19 // Simple implementation of ForeignSessionsProvider that delegates to |
| 19 // SessionsSyncManager. It holds onto a non-owning pointer, with the assumption | 20 // SessionsSyncManager. It holds onto a non-owning pointer, with the assumption |
| 20 // that this class is only used by classes owned by SessionsSyncManager itself. | 21 // that this class is only used by classes owned by SessionsSyncManager itself. |
| 21 class SessionsSyncManagerWrapper : public sync_driver::ForeignSessionsProvider { | 22 class SessionsSyncManagerWrapper |
| 23 : public sync_sessions::ForeignSessionsProvider { |
| 22 public: | 24 public: |
| 23 explicit SessionsSyncManagerWrapper(SessionsSyncManager* manager) | 25 explicit SessionsSyncManagerWrapper(SessionsSyncManager* manager) |
| 24 : manager_(manager) {} | 26 : manager_(manager) {} |
| 25 ~SessionsSyncManagerWrapper() override{}; | 27 ~SessionsSyncManagerWrapper() override{}; |
| 26 bool GetAllForeignSessions( | 28 bool GetAllForeignSessions( |
| 27 std::vector<const sync_driver::SyncedSession*>* sessions) override { | 29 std::vector<const sync_driver::SyncedSession*>* sessions) override { |
| 28 return manager_->GetAllForeignSessions(sessions); | 30 return manager_->GetAllForeignSessions(sessions); |
| 29 } | 31 } |
| 30 | 32 |
| 31 private: | 33 private: |
| 32 SessionsSyncManager* manager_; | 34 SessionsSyncManager* manager_; |
| 33 DISALLOW_COPY_AND_ASSIGN(SessionsSyncManagerWrapper); | 35 DISALLOW_COPY_AND_ASSIGN(SessionsSyncManagerWrapper); |
| 34 }; | 36 }; |
| 35 | 37 |
| 36 } // namespace | 38 } // namespace |
| 37 | 39 |
| 38 PageRevisitBroadcaster::PageRevisitBroadcaster(SessionsSyncManager* manager, | 40 PageRevisitBroadcaster::PageRevisitBroadcaster(SessionsSyncManager* manager, |
| 39 Profile* profile) { | 41 Profile* profile) { |
| 40 const std::string group_name = | 42 const std::string group_name = |
| 41 base::FieldTrialList::FindFullName("PageRevisitInstrumentation"); | 43 base::FieldTrialList::FindFullName("PageRevisitInstrumentation"); |
| 42 bool shouldInstrument = group_name == "Enabled"; | 44 bool shouldInstrument = group_name == "Enabled"; |
| 43 if (shouldInstrument) { | 45 if (shouldInstrument) { |
| 44 revisit_observers_.push_back(new sync_driver::SessionsPageRevisitObserver( | 46 revisit_observers_.push_back(new sync_sessions::SessionsPageRevisitObserver( |
| 45 scoped_ptr<sync_driver::ForeignSessionsProvider>( | 47 scoped_ptr<sync_sessions::ForeignSessionsProvider>( |
| 46 new SessionsSyncManagerWrapper(manager)))); | 48 new SessionsSyncManagerWrapper(manager)))); |
| 49 |
| 47 // TODO(skym): Add bookmarks observer. | 50 // TODO(skym): Add bookmarks observer. |
| 48 // TODO(skym): Add typed URL observer. | 51 // TODO(skym): Add typed URL observer. |
| 49 } | 52 } |
| 50 } | 53 } |
| 51 | 54 |
| 52 PageRevisitBroadcaster::~PageRevisitBroadcaster() {} | 55 PageRevisitBroadcaster::~PageRevisitBroadcaster() {} |
| 53 | 56 |
| 54 void PageRevisitBroadcaster::OnPageVisit(const GURL& url, | 57 void PageRevisitBroadcaster::OnPageVisit(const GURL& url, |
| 55 const ui::PageTransition transition) { | 58 const ui::PageTransition transition) { |
| 56 if (ShouldSyncURL(url)) { | 59 if (ShouldSyncURL(url)) { |
| 57 sync_driver::PageVisitObserver::TransitionType converted( | 60 sync_sessions::PageVisitObserver::TransitionType converted( |
| 58 ConvertTransitionEnum(transition)); | 61 ConvertTransitionEnum(transition)); |
| 59 for (auto* observer : revisit_observers_) { | 62 for (auto* observer : revisit_observers_) { |
| 60 observer->OnPageVisit(url, converted); | 63 observer->OnPageVisit(url, converted); |
| 61 } | 64 } |
| 62 } | 65 } |
| 63 } | 66 } |
| 64 | 67 |
| 65 // Static | 68 // Static |
| 66 sync_driver::PageVisitObserver::TransitionType | 69 sync_sessions::PageVisitObserver::TransitionType |
| 67 PageRevisitBroadcaster::ConvertTransitionEnum( | 70 PageRevisitBroadcaster::ConvertTransitionEnum( |
| 68 const ui::PageTransition original) { | 71 const ui::PageTransition original) { |
| 69 switch (ui::PageTransitionStripQualifier(original)) { | 72 switch (ui::PageTransitionStripQualifier(original)) { |
| 70 case ui::PAGE_TRANSITION_LINK: | 73 case ui::PAGE_TRANSITION_LINK: |
| 71 if (original & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) { | 74 if (original & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) { |
| 72 return sync_driver::PageVisitObserver::kTransitionCopyPaste; | 75 return sync_sessions::PageVisitObserver::kTransitionCopyPaste; |
| 73 } else { | 76 } else { |
| 74 return sync_driver::PageVisitObserver::kTransitionPage; | 77 return sync_sessions::PageVisitObserver::kTransitionPage; |
| 75 } | 78 } |
| 76 case ui::PAGE_TRANSITION_TYPED: | 79 case ui::PAGE_TRANSITION_TYPED: |
| 77 return sync_driver::PageVisitObserver::kTransitionOmniboxUrl; | 80 return sync_sessions::PageVisitObserver::kTransitionOmniboxUrl; |
| 78 | 81 |
| 79 case ui::PAGE_TRANSITION_AUTO_BOOKMARK: | 82 case ui::PAGE_TRANSITION_AUTO_BOOKMARK: |
| 80 return sync_driver::PageVisitObserver::kTransitionBookmark; | 83 return sync_sessions::PageVisitObserver::kTransitionBookmark; |
| 81 | 84 |
| 82 case ui::PAGE_TRANSITION_AUTO_SUBFRAME: | 85 case ui::PAGE_TRANSITION_AUTO_SUBFRAME: |
| 83 case ui::PAGE_TRANSITION_MANUAL_SUBFRAME: | 86 case ui::PAGE_TRANSITION_MANUAL_SUBFRAME: |
| 84 // These are not expected, we only expect top-level frame transitions. | 87 // These are not expected, we only expect top-level frame transitions. |
| 85 return sync_driver::PageVisitObserver::kTransitionUnknown; | 88 return sync_sessions::PageVisitObserver::kTransitionUnknown; |
| 86 | 89 |
| 87 case ui::PAGE_TRANSITION_GENERATED: | 90 case ui::PAGE_TRANSITION_GENERATED: |
| 88 return sync_driver::PageVisitObserver::kTransitionOmniboxDefaultSearch; | 91 return sync_sessions::PageVisitObserver::kTransitionOmniboxDefaultSearch; |
| 89 | 92 |
| 90 case ui::PAGE_TRANSITION_AUTO_TOPLEVEL: | 93 case ui::PAGE_TRANSITION_AUTO_TOPLEVEL: |
| 91 if (original & ui::PAGE_TRANSITION_FORWARD_BACK) { | 94 if (original & ui::PAGE_TRANSITION_FORWARD_BACK) { |
| 92 return sync_driver::PageVisitObserver::kTransitionForwardBackward; | 95 return sync_sessions::PageVisitObserver::kTransitionForwardBackward; |
| 93 } else { | 96 } else { |
| 94 return sync_driver::PageVisitObserver::kTransitionUnknown; | 97 return sync_sessions::PageVisitObserver::kTransitionUnknown; |
| 95 } | 98 } |
| 96 | 99 |
| 97 case ui::PAGE_TRANSITION_FORM_SUBMIT: | 100 case ui::PAGE_TRANSITION_FORM_SUBMIT: |
| 98 return sync_driver::PageVisitObserver::kTransitionPage; | 101 return sync_sessions::PageVisitObserver::kTransitionPage; |
| 99 | 102 |
| 100 case ui::PAGE_TRANSITION_RELOAD: | 103 case ui::PAGE_TRANSITION_RELOAD: |
| 101 // Refreshing pages also carry PAGE_TRANSITION_RELOAD but the url never | 104 // Refreshing pages also carry PAGE_TRANSITION_RELOAD but the url never |
| 102 // changes so we don't expect to ever get them. | 105 // changes so we don't expect to ever get them. |
| 103 return sync_driver::PageVisitObserver::kTransitionRestore; | 106 return sync_sessions::PageVisitObserver::kTransitionRestore; |
| 104 | 107 |
| 105 case ui::PAGE_TRANSITION_KEYWORD: | 108 case ui::PAGE_TRANSITION_KEYWORD: |
| 106 case ui::PAGE_TRANSITION_KEYWORD_GENERATED: | 109 case ui::PAGE_TRANSITION_KEYWORD_GENERATED: |
| 107 return sync_driver::PageVisitObserver::kTransitionOmniboxTemplateSearch; | 110 return sync_sessions::PageVisitObserver::kTransitionOmniboxTemplateSearch; |
| 108 | 111 |
| 109 default: | 112 default: |
| 110 return sync_driver::PageVisitObserver::kTransitionUnknown; | 113 return sync_sessions::PageVisitObserver::kTransitionUnknown; |
| 111 } | 114 } |
| 112 } | 115 } |
| 113 | 116 |
| 114 } // namespace browser_sync | 117 } // namespace browser_sync |
| OLD | NEW |