chrome/browser/ui/cocoa/one_click_signin_view_controller.mm - Issue 99343006: Merge 237115 "Security fix for untrusted signin confirm dialog"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/one_click_signin_view_controller.mm

Issue 99343006: Merge 237115 "Security fix for untrusted signin confirm dialog" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1700/src/

Patch Set: Created 7 years 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

« no previous file with comments | « chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm ('k') | chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/one_click_signin_view_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/one_click_signin_view_controller.mm (revision 238137)

+++ chrome/browser/ui/cocoa/one_click_signin_view_controller.mm (working copy)

@@ -67,7 +67,7 @@

// the window and nothing else has initiated the sync, we must do so here

if (isSyncDialog_ && !startSyncCallback_.is_null()) {

base::ResetAndReturn(&startSyncCallback_).Run(

- OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);

+ OneClickSigninSyncStarter::UNDO_SYNC);

}