Details see inner bug: https://b.corp.google.com/issues/73452374
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/84ea9200301cf886a55ff919c00dccb28842f6c0 commit 84ea9200301cf886a55ff919c00dccb28842f6c0 Author: lgcheng <lgcheng@google.com> Date: Fri Mar 30 03:12:31 2018 GDPR: Arc opt-in string change. Mainly the string change. Since we add more text in the ToS page, split the ToS in two phases. First phase shows ToS webview and limited contents. Second phase show all the content, make this page scrollable and scroll to the bottom. ToS webview height should not change when the flow goes from phase one to phase two. Changes affect on both OOBE flow and in-session Arc opt-in. For OOBE flow, show usage/diagnose status in ToS page if user is device owner and has previously confirmed sending usage/diagnose data. Call update ToS webview height when necessary in OOBE flow. Bug: b/73452374 Bug: 826927 Test: Manual Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I33fe36403be86cb9b157417747740e786a6510a2 Reviewed-on: https://chromium-review.googlesource.com/984492 Commit-Queue: Long Cheng <lgcheng@google.com> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Cr-Commit-Position: refs/heads/master@{#547096} [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/app/chromeos_strings.grdp [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/chromeos/arc/arc_support_host.cc [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/arc_support/background.js [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/arc_support/main.css [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/arc_support/main.html [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/arc_support/playstore.css [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/login/arc_terms_of_service.css [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/login/arc_terms_of_service.html [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/login/arc_terms_of_service.js [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js [modify] https://crrev.com/84ea9200301cf886a55ff919c00dccb28842f6c0/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/1bf149747510505d4e5144e59ded29b99c034455 commit 1bf149747510505d4e5144e59ded29b99c034455 Author: lgcheng <lgcheng@google.com> Date: Tue Apr 03 22:38:40 2018 Arc OOBE optin legacy(Non md) As request by khmel@ After we add new content to Arc opt-in flow, we should at least make legacy code not broken or crashed as long as we have not removed it. Note: Do not merge to M66. Legacy code is not running in product. Bug: b/73452374 Bug: 826927 Test: Manual Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I1a1431c8afd11898cdd7e4b21dfe1ca6bfc09aad Reviewed-on: https://chromium-review.googlesource.com/993708 Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Commit-Queue: Long Cheng <lgcheng@google.com> Cr-Commit-Position: refs/heads/master@{#547853} [modify] https://crrev.com/1bf149747510505d4e5144e59ded29b99c034455/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.html [modify] https://crrev.com/1bf149747510505d4e5144e59ded29b99c034455/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/058b5973c143f6586d1fbd4e5ba6ec7b1282439b commit 058b5973c143f6586d1fbd4e5ba6ec7b1282439b Author: lgcheng <lgcheng@google.com> Date: Thu Apr 12 01:11:05 2018 GDPR: Arc opt-in string change. Mainly the string change. Since we add more text in the ToS page, split the ToS in two phases. First phase shows ToS webview and limited contents. Second phase show all the content, make this page scrollable and scroll to the bottom. ToS webview height should not change when the flow goes from phase one to phase two. Changes affect on both OOBE flow and in-session Arc opt-in. For OOBE flow, show usage/diagnose status in ToS page if user is device owner and has previously confirmed sending usage/diagnose data. Call update ToS webview height when necessary in OOBE flow. TBR=xiyuan@chromium.org Bug: b/73452374 Bug: 826927 Test: Manual Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I33fe36403be86cb9b157417747740e786a6510a2 Reviewed-on: https://chromium-review.googlesource.com/984492 Commit-Queue: Long Cheng <lgcheng@google.com> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#547096}(cherry picked from commit 84ea9200301cf886a55ff919c00dccb28842f6c0) Reviewed-on: https://chromium-review.googlesource.com/993332 Reviewed-by: Long Cheng <lgcheng@google.com> Cr-Commit-Position: refs/branch-heads/3359@{#694} Cr-Branched-From: 66afc5e5d10127546cc4b98b9117aff588b5e66b-refs/heads/master@{#540276} [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/app/chromeos_strings.grdp [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/chromeos/arc/arc_support_host.cc [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/arc_support/background.js [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/arc_support/main.css [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/arc_support/main.html [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/arc_support/playstore.css [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/login/arc_terms_of_service.css [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/login/arc_terms_of_service.html [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/login/arc_terms_of_service.js [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js [modify] https://crrev.com/058b5973c143f6586d1fbd4e5ba6ec7b1282439b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/ec4eab3f460438d11c97eafb3032af53aba6e26c commit ec4eab3f460438d11c97eafb3032af53aba6e26c Author: Arthur Sonzogni <arthursonzogni@chromium.org> Date: Fri Apr 13 08:05:27 2018 Revert "GDPR: Arc opt-in string change." This reverts commit 058b5973c143f6586d1fbd4e5ba6ec7b1282439b. Reason for revert: I suspect it breaks the Clank Official build See https://crbug.com/832554 Original change's description: > GDPR: Arc opt-in string change. > > Mainly the string change. > Since we add more text in the ToS page, split the ToS in two phases. > First phase shows ToS webview and limited contents. > Second phase show all the content, make this page scrollable and scroll to > the bottom. ToS webview height should not change when the flow goes from > phase one to phase two. > Changes affect on both OOBE flow and in-session Arc opt-in. > For OOBE flow, show usage/diagnose status in ToS page if user is device > owner and has previously confirmed sending usage/diagnose data. > Call update ToS webview height when necessary in OOBE flow. > > TBR=xiyuan@chromium.org > > Bug: b/73452374 > Bug: 826927 > Test: Manual > Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation > Change-Id: I33fe36403be86cb9b157417747740e786a6510a2 > Reviewed-on: https://chromium-review.googlesource.com/984492 > Commit-Queue: Long Cheng <lgcheng@google.com> > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> > Cr-Original-Commit-Position: refs/heads/master@{#547096}(cherry picked from commit 84ea9200301cf886a55ff919c00dccb28842f6c0) > Reviewed-on: https://chromium-review.googlesource.com/993332 > Reviewed-by: Long Cheng <lgcheng@google.com> > Cr-Commit-Position: refs/branch-heads/3359@{#694} > Cr-Branched-From: 66afc5e5d10127546cc4b98b9117aff588b5e66b-refs/heads/master@{#540276} TBR=jhorwich@chromium.org,lgcheng@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: b/73452374, 826927, 832554 Change-Id: I33859430dab907714316d796287e0119f5c679fb Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Reviewed-on: https://chromium-review.googlesource.com/1011963 Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org> Cr-Commit-Position: refs/branch-heads/3359@{#700} Cr-Branched-From: 66afc5e5d10127546cc4b98b9117aff588b5e66b-refs/heads/master@{#540276} [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/app/chromeos_strings.grdp [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/chromeos/arc/arc_support_host.cc [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/arc_support/background.js [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/arc_support/main.css [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/arc_support/main.html [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/arc_support/playstore.css [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/login/arc_terms_of_service.css [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/login/arc_terms_of_service.html [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/login/arc_terms_of_service.js [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js [modify] https://crrev.com/ec4eab3f460438d11c97eafb3032af53aba6e26c/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/6756d5ad3ec62943ac1e0a67436b35ac22447b8f commit 6756d5ad3ec62943ac1e0a67436b35ac22447b8f Author: Arthur Sonzogni <arthursonzogni@chromium.org> Date: Fri Apr 13 08:49:36 2018 Reland "GDPR: Arc opt-in string change." This reverts commit ec4eab3f460438d11c97eafb3032af53aba6e26c. Reason for revert: It was speculatively reverted by mistake. Original change's description: > Revert "GDPR: Arc opt-in string change." > > This reverts commit 058b5973c143f6586d1fbd4e5ba6ec7b1282439b. > > Reason for revert: I suspect it breaks the Clank Official build > See https://crbug.com/832554 > > Original change's description: > > GDPR: Arc opt-in string change. > > > > Mainly the string change. > > Since we add more text in the ToS page, split the ToS in two phases. > > First phase shows ToS webview and limited contents. > > Second phase show all the content, make this page scrollable and scroll to > > the bottom. ToS webview height should not change when the flow goes from > > phase one to phase two. > > Changes affect on both OOBE flow and in-session Arc opt-in. > > For OOBE flow, show usage/diagnose status in ToS page if user is device > > owner and has previously confirmed sending usage/diagnose data. > > Call update ToS webview height when necessary in OOBE flow. > > > > TBR=xiyuan@chromium.org > > > > Bug: b/73452374 > > Bug: 826927 > > Test: Manual > > Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation > > Change-Id: I33fe36403be86cb9b157417747740e786a6510a2 > > Reviewed-on: https://chromium-review.googlesource.com/984492 > > Commit-Queue: Long Cheng <lgcheng@google.com> > > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> > > Cr-Original-Commit-Position: refs/heads/master@{#547096}(cherry picked from commit 84ea9200301cf886a55ff919c00dccb28842f6c0) > > Reviewed-on: https://chromium-review.googlesource.com/993332 > > Reviewed-by: Long Cheng <lgcheng@google.com> > > Cr-Commit-Position: refs/branch-heads/3359@{#694} > > Cr-Branched-From: 66afc5e5d10127546cc4b98b9117aff588b5e66b-refs/heads/master@{#540276} > > TBR=jhorwich@chromium.org,lgcheng@google.com > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: b/73452374, 826927, 832554 > Change-Id: I33859430dab907714316d796287e0119f5c679fb > Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation > Reviewed-on: https://chromium-review.googlesource.com/1011963 > Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org> > Cr-Commit-Position: refs/branch-heads/3359@{#700} > Cr-Branched-From: 66afc5e5d10127546cc4b98b9117aff588b5e66b-refs/heads/master@{#540276} TBR=jhorwich@chromium.org,lgcheng@google.com,arthursonzogni@chromium.org Change-Id: I2793740e605e3c903fb07b973372aa751db63b56 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: b/73452374, 826927, 832554 Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Reviewed-on: https://chromium-review.googlesource.com/1011964 Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org> Cr-Commit-Position: refs/branch-heads/3359@{#701} Cr-Branched-From: 66afc5e5d10127546cc4b98b9117aff588b5e66b-refs/heads/master@{#540276} [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/app/chromeos_strings.grdp [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/chromeos/arc/arc_support_host.cc [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/arc_support/background.js [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/arc_support/main.css [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/arc_support/main.html [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/arc_support/playstore.css [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/login/arc_terms_of_service.css [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/login/arc_terms_of_service.html [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/login/arc_terms_of_service.js [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js [modify] https://crrev.com/6756d5ad3ec62943ac1e0a67436b35ac22447b8f/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
Comment 1 by lgcheng@google.com
, Mar 28 2018