|
Merge 182705
> Properly handle disabling sync via the google dashboard.
>
> Add SigninManager::ProhibitSignout() that the policy code can use to disable
> signout. This makes our previous ad-hoc signout prohibition more stable by
> catching other places where we might sign out (such as cancelling sync during
> re-auth).
>
> Add SigninManager::IsSignoutProhibited() which UI code that wants to show/hide
> signout UI can call.
>
> Restores old behavior where stopping sync via the google dashboard will try to
> sign out the user.
>
> Fixed sync UI to properly display the "Sync is stopped via the google dashboard"
> message when sync is stopped on desktop platforms.
>
> Updated sync settings code to trigger a re-auth flow when the user clicks on "Advanced Sync Setup..." when sync is stopped via the dashboard.
>
> BUG= 174134
>
> Review URL: https://codereview.chromium.org/12258036
TBR=atwilson@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183434
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+82 lines, -17 lines) |
Patch |
 |
M |
chrome/browser/policy/user_policy_signin_service.h
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/policy/user_policy_signin_service.cc
|
View
|
|
3 chunks |
+13 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/policy/user_policy_signin_service_unittest.cc
|
View
|
|
3 chunks |
+6 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/signin/signin_manager.h
|
View
|
|
2 chunks |
+10 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/signin/signin_manager.cc
|
View
|
|
3 chunks |
+13 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/signin/signin_manager_fake.h
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/signin/signin_manager_fake.cc
|
View
|
|
2 chunks |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/signin/signin_manager_unittest.cc
|
View
|
|
1 chunk |
+10 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/sync/profile_sync_service.cc
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/sync/sync_ui_util.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/webui/options/browser_options_handler.cc
|
View
|
|
2 chunks |
+2 lines, -9 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/webui/sync_setup_handler.cc
|
View
|
|
1 chunk |
+8 lines, -3 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|