New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync #226

Merged

AlexeyBarabash merged 97 commits into master from WIP_sync

Nov 1, 2018

Contributor

AlexeyBarabash commented Jul 6, 2018

Initial work in progress PR for sync
brave/brave-browser#29

AlexeyBarabash added the pr/work-in-progress label

bbondy changed the title ~~work in progress for sync~~ WIP: Sync

AlexeyBarabash force-pushed the WIP_sync branch 4 times, most recently from 0e2d0a6 to 053794d Compare

July 16, 2018 16:06

AlexeyBarabash force-pushed the WIP_sync branch from 053794d to 8dd04f3 Compare

July 17, 2018 20:50

AlexeyBarabash force-pushed the WIP_sync branch 2 times, most recently from 53a3630 to 81d9d6c Compare

July 26, 2018 08:36

bbondy assigned AlexeyBarabash

AlexeyBarabash force-pushed the WIP_sync branch 2 times, most recently from 847c8b9 to c426e1b Compare

August 13, 2018 11:45

bridiver reviewed

View reviewed changes

patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch Outdated Show resolved Hide resolved

bridiver reviewed

View reviewed changes

patches/components-browser_sync-profile_sync_service.h.patch Outdated Show resolved Hide resolved

bridiver reviewed

View reviewed changes

patches/extensions-browser-extension_event_histogram_value.h.patch Outdated Show resolved Hide resolved

bridiver reviewed

View reviewed changes

script/copy-sync-extension.py Outdated Show resolved Hide resolved

bridiver reviewed

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

bridiver reviewed

View reviewed changes

patches/chrome-browser-extensions-component_extensions_whitelist-whitelist.cc.patch Outdated Show resolved Hide resolved

bridiver reviewed

View reviewed changes

components/brave_sync/controller_impl.cc Outdated Show resolved Hide resolved

bbondy reviewed

View reviewed changes

chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc Outdated Show resolved Hide resolved

bbondy reviewed

View reviewed changes

chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc Outdated Show resolved Hide resolved

bridiver reviewed

View reviewed changes

script/build-simple-js-bundle.py Show resolved Hide resolved

AlexeyBarabash force-pushed the WIP_sync branch 5 times, most recently from 9a1a07a to 0529ea8 Compare

September 10, 2018 12:55

AlexeyBarabash force-pushed the WIP_sync branch from 4f8fe45 to 115a013 Compare

September 19, 2018 18:33

darkdh reviewed

View reviewed changes

components/brave_sync/object_map.h Outdated Show resolved Hide resolved

AlexeyBarabash force-pushed the WIP_sync branch from 81e105c to 1648396 Compare

September 30, 2018 08:15

AlexeyBarabash and others added 11 commits

November 1, 2018 19:02


          more bookmark_change_processor tests

b7d740f

updated tests according to new bookmarks order processing

more BraveSyncService unittests


          clearing order for shifted nodes when moving

c1f5e79


          Fix syncTimestamp propagation

03a2a79

syncTimestamp will only be set from native side when node is originally
created from local


          added new and adapted existing test to new resolve records way

1f1aff4


          GetTaskRunnerForThread removal (C71 upgrade)

33af016

https://chromium.googlesource.com/chromium/src/+/4d89f64d9cffcf502426eaea8c650ac805cb3696


          more BraveSyncService tests

753b75b


          command line key to enable use of sync, disabled by default

d7823ab


          Address review comments

cf5f057

#226 (review)


          ts lint

045518d


          removed BraveSyncServiceObserver::OnLogMessage because it just sends …

eb93cac

…message to console log, according to codereview


          Fix build on Windows

30cd566

--
1. enum name conflicts with windows header
../..\brave/components/brave_sync/jslib_messages.h(115,5): error: expected identifier
  DELETE = 2,
..\..\..\..\Program Files (x86)\Windows Kits\10\include\10.0.17134.0\um\winnt.h(8881,42): note: expanded from macro 'DELETE'
\#define DELETE                           (0x00010000L)
            ^
--
2. forward declaration doesn't work with unqiue_ptr on Windows
In file included from ../..\brave/components/brave_sync/client/brave_sync_client.h:10:
 ..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.11.25503\include\memory(1997,21):
  error: invalid application of 'sizeof' to an incomplete type 'brave_sync::jslib::SyncRecord'
                static_assert(0 < sizeof (_Ty),
                                  ^~~~~~~~~~~~
...

AlexeyBarabash force-pushed the WIP_sync branch from 800fd4f to d6b8ddd Compare

November 1, 2018 17:06

bridiver reviewed

View reviewed changes

components/brave_sync/jslib_messages.h

-                  DELETE = 2,
-                  A_MIN = CREATE,
-                  A_MAX = DELETE,
+                  A_CREATE = 0,

Collaborator

bridiver Nov 1, 2018

this seems really hacky, but I think we'll replace this with the chromium sync enums later anyway

Member

darkdh Nov 1, 2018

chromium doesn't use raw DELETE either

  enum SyncChangeType {
    ACTION_INVALID,
    ACTION_ADD,
    ACTION_UPDATE,
    ACTION_DELETE,
  };

AlexeyBarabash force-pushed the WIP_sync branch 2 times, most recently from 8dffa2a to cbb16ca Compare

November 1, 2018 17:32


          fix of incorrect sync initialization with wrong code words

c5853d8

AlexeyBarabash force-pushed the WIP_sync branch from cbb16ca to c5853d8 Compare

November 1, 2018 17:40

bridiver approved these changes

View reviewed changes

AlexeyBarabash merged commit d8e7d68 into master

darkdh pushed a commit that referenced this pull request


          Merge pull request #226 from brave/WIP_sync

b1ca103

Sync

Member

darkdh commented Nov 1, 2018

master: d8e7d68
0.57.x: b1ca103

darkdh added the merged/0.57.x-Dev label

NejcZdovc deleted the WIP_sync branch

November 2, 2018 04:27

bbondy added this to the 0.57.x - Release milestone

NejcZdovc pushed a commit that referenced this pull request


          Rewards: Imported from brave-ui: Fixes #226, combines disabled text s…

cbdd86d

…trings

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet