Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(796)

Unified Diff: chrome/browser/sync/sessions/page_revisit_broadcaster.cc

Issue 1387253004: [Sync] Creating sync_sessions component, moving revisit logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing test_support target. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/sessions/page_revisit_broadcaster.cc
diff --git a/chrome/browser/sync/sessions/page_revisit_broadcaster.cc b/chrome/browser/sync/sessions/page_revisit_broadcaster.cc
index a0d76a26dc0bc5fb581d49d5b38a686d6caf0be5..a9c31505bef6198c8380c737e4cb582931ff5d7c 100644
--- a/chrome/browser/sync/sessions/page_revisit_broadcaster.cc
+++ b/chrome/browser/sync/sessions/page_revisit_broadcaster.cc
@@ -4,12 +4,13 @@
#include "chrome/browser/sync/sessions/page_revisit_broadcaster.h"
+#include <string>
#include <vector>
#include "base/metrics/field_trial.h"
#include "chrome/browser/sync/glue/synced_session_util.h"
#include "chrome/browser/sync/sessions/sessions_sync_manager.h"
-#include "components/sync_driver/revisit/sessions_page_revisit_observer.h"
+#include "components/sync_sessions/revisit/sessions_page_revisit_observer.h"
namespace browser_sync {
@@ -18,7 +19,8 @@ namespace {
// Simple implementation of ForeignSessionsProvider that delegates to
// SessionsSyncManager. It holds onto a non-owning pointer, with the assumption
// that this class is only used by classes owned by SessionsSyncManager itself.
-class SessionsSyncManagerWrapper : public sync_driver::ForeignSessionsProvider {
+class SessionsSyncManagerWrapper
+ : public sync_sessions::ForeignSessionsProvider {
public:
explicit SessionsSyncManagerWrapper(SessionsSyncManager* manager)
: manager_(manager) {}
@@ -41,9 +43,10 @@ PageRevisitBroadcaster::PageRevisitBroadcaster(SessionsSyncManager* manager,
base::FieldTrialList::FindFullName("PageRevisitInstrumentation");
bool shouldInstrument = group_name == "Enabled";
if (shouldInstrument) {
- revisit_observers_.push_back(new sync_driver::SessionsPageRevisitObserver(
- scoped_ptr<sync_driver::ForeignSessionsProvider>(
+ revisit_observers_.push_back(new sync_sessions::SessionsPageRevisitObserver(
+ scoped_ptr<sync_sessions::ForeignSessionsProvider>(
new SessionsSyncManagerWrapper(manager))));
+
// TODO(skym): Add bookmarks observer.
// TODO(skym): Add typed URL observer.
}
@@ -54,7 +57,7 @@ PageRevisitBroadcaster::~PageRevisitBroadcaster() {}
void PageRevisitBroadcaster::OnPageVisit(const GURL& url,
const ui::PageTransition transition) {
if (ShouldSyncURL(url)) {
- sync_driver::PageVisitObserver::TransitionType converted(
+ sync_sessions::PageVisitObserver::TransitionType converted(
ConvertTransitionEnum(transition));
for (auto* observer : revisit_observers_) {
observer->OnPageVisit(url, converted);
@@ -63,51 +66,51 @@ void PageRevisitBroadcaster::OnPageVisit(const GURL& url,
}
// Static
-sync_driver::PageVisitObserver::TransitionType
+sync_sessions::PageVisitObserver::TransitionType
PageRevisitBroadcaster::ConvertTransitionEnum(
const ui::PageTransition original) {
switch (ui::PageTransitionStripQualifier(original)) {
case ui::PAGE_TRANSITION_LINK:
if (original & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) {
- return sync_driver::PageVisitObserver::kTransitionCopyPaste;
+ return sync_sessions::PageVisitObserver::kTransitionCopyPaste;
} else {
- return sync_driver::PageVisitObserver::kTransitionPage;
+ return sync_sessions::PageVisitObserver::kTransitionPage;
}
case ui::PAGE_TRANSITION_TYPED:
- return sync_driver::PageVisitObserver::kTransitionOmniboxUrl;
+ return sync_sessions::PageVisitObserver::kTransitionOmniboxUrl;
case ui::PAGE_TRANSITION_AUTO_BOOKMARK:
- return sync_driver::PageVisitObserver::kTransitionBookmark;
+ return sync_sessions::PageVisitObserver::kTransitionBookmark;
case ui::PAGE_TRANSITION_AUTO_SUBFRAME:
case ui::PAGE_TRANSITION_MANUAL_SUBFRAME:
// These are not expected, we only expect top-level frame transitions.
- return sync_driver::PageVisitObserver::kTransitionUnknown;
+ return sync_sessions::PageVisitObserver::kTransitionUnknown;
case ui::PAGE_TRANSITION_GENERATED:
- return sync_driver::PageVisitObserver::kTransitionOmniboxDefaultSearch;
+ return sync_sessions::PageVisitObserver::kTransitionOmniboxDefaultSearch;
case ui::PAGE_TRANSITION_AUTO_TOPLEVEL:
if (original & ui::PAGE_TRANSITION_FORWARD_BACK) {
- return sync_driver::PageVisitObserver::kTransitionForwardBackward;
+ return sync_sessions::PageVisitObserver::kTransitionForwardBackward;
} else {
- return sync_driver::PageVisitObserver::kTransitionUnknown;
+ return sync_sessions::PageVisitObserver::kTransitionUnknown;
}
case ui::PAGE_TRANSITION_FORM_SUBMIT:
- return sync_driver::PageVisitObserver::kTransitionPage;
+ return sync_sessions::PageVisitObserver::kTransitionPage;
case ui::PAGE_TRANSITION_RELOAD:
// Refreshing pages also carry PAGE_TRANSITION_RELOAD but the url never
// changes so we don't expect to ever get them.
- return sync_driver::PageVisitObserver::kTransitionRestore;
+ return sync_sessions::PageVisitObserver::kTransitionRestore;
case ui::PAGE_TRANSITION_KEYWORD:
case ui::PAGE_TRANSITION_KEYWORD_GENERATED:
- return sync_driver::PageVisitObserver::kTransitionOmniboxTemplateSearch;
+ return sync_sessions::PageVisitObserver::kTransitionOmniboxTemplateSearch;
default:
- return sync_driver::PageVisitObserver::kTransitionUnknown;
+ return sync_sessions::PageVisitObserver::kTransitionUnknown;
}
}

Powered by Google App Engine
This is Rietveld 408576698