Issue 15830003: Manual Merge 201756 "Changes how to compute the id of a display." (2nd)

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 15830003: Manual Merge 201756 "Changes how to compute the id of a display." (2nd) (Closed)

Created:
7 years, 7 months ago by Jun Mukai

Modified:
7 years, 7 months ago

Reviewers:
oshima

CC:
chromium-reviews, sadrul, ben+watch_chromium.org

Base URL:
svn://svn.chromium.org/chrome/branches/1500/src/

Visibility:
Public.

Manual Merge 201756 "Changes how to compute the id of a display." (2nd) > Due to the discussion in crbug.com/240341, we prefer to use > the name field rather than the product_code field. > > BUG=240341 > R=oshima@chromium.org, marcheu@chromium.org > TEST=compilation passed The first attempt of the merge was reverted due to a compile error. This 2nd manual merge includes the fix for the error (adding a missing include). TBR=oshima@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202225

Created: 7 years, 7 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+18 lines, -10 lines)			Patch
M	ash/display/display_change_observer_x11.cc	View	2 chunks	+13 lines, -5 lines	0 comments	Download
M	ui/gfx/display.h	View	1 chunk	+2 lines, -2 lines	0 comments	Download
M	ui/gfx/display.cc	View	1 chunk	+3 lines, -3 lines	0 comments	Download

Total messages: 1 (0 generated)

Jun Mukai

7 years, 7 months ago (2013-05-24 23:30:06 UTC) #1

Message was sent while issue was closed.

Committed patchset #1 manually as r202225 (presubmit successful).