Issue 5522001: Fix some merge issues from merge of 66690 (r66830) and 66933 (r66934)

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

Issue 5522001: Fix some merge issues from merge of 66690 (r66830) and 66933 (r66934) (Closed)

Created:
10 years ago by stevenjb

Modified:
9 years, 7 months ago

Reviewers:
DaveMoore, zel

CC:
chromium-reviews, nkostylev+cc_chromium.org, davemoore+watch_chromium.org, ben+cc_chromium.org

Base URL:
svn://svn.chromium.org/chrome/branches/552d/src/

Visibility:
Public.

Fix some merge issues from merge of 66690 (r66830) and 66933 (r66934) BUG=chromium-os:8752 TEST=see issue Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67921

Created: 10 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+13 lines, -8 lines)			Patch
	M	chrome/browser/browser_init.cc	View		1 chunk	+6 lines, -1 line	0 comments	Download
	M	chrome/browser/chromeos/login/existing_user_controller.cc	View		2 chunks	+7 lines, -7 lines	0 comments	Download

Total messages: 2 (0 generated)

stevenjb

I happened to notice that the settings/personal page wasn't showing up for strict strong auth ...

10 years ago (2010-12-01 23:59:28 UTC) #1

zel

10 years ago (2010-12-02 00:09:35 UTC) #2

LGTM

please merge this into 552d as well, we might pick it up from there if there is
another build coming